Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1636124

Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1

Show all headers | View raw

On Thu, May 4, 2017 at 5:18 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
>
> Here is the big set of new char/misc driver drivers and features for
> 4.12-rc1.

Ugh. I'm not particularly happy with the conflicts I got and my
resolutions there-of.

I did resolve them - in the case of drivers/scsi/osd/osd_uld.c as per
James' suggestion from his SCSI pull. Thanks.

But even that resolution I'm not entirely happy with: somebody should
check that it cleans up oud properly

But the one I'm really unhappy with is my tpm-chip.c resolution.

In particular, commit 8dbbf5825181 ("tpm-chip: utilize new
cdev_device_add helper function") made the tpm-chip code use that
cdev_device_add/del pattern for chip->[c]dev. Fine.

But then commit fdc915f7f719 ("tpm: expose spaces via a device link
/dev/tpmrm<n>") added the *exact* same old pattern to a new
"chip->[c]devs" (note the extra 's') and did so in a particularly ugly
way too.

James, why did you do that nasty

        if (chip->flags & TPM_CHIP_FLAG_TPM2)

*twice*, instead of just doing things properly inside *one* test?

Anyway, my merge resolution tries to just apply the same
cdev_device_add/del pattern to the new chip->[c]devs entries, because
not doing so seemed criminally ugly.

It compiles. It looks better than the mess it was. But it may not work.

James, Jarkko, you need to look at that tpm merge of mine. And James,
double-check my osd_uld thing too.

                 Linus

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] Char/Misc driver patches for 4.12-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-05-05 02:20 +0200
  Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-05 04:30 +0200
    Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-05 18:10 +0200
      Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-05-05 18:40 +0200
        Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-05 21:50 +0200
        Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-05 22:10 +0200
          Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-06 07:10 +0200
            Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-06 20:10 +0200
              Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-06 20:20 +0200
      Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-05-05 18:40 +0200
        Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1 James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-05-05 18:50 +0200

csiph-web