[GIT PULL] platform-drivers-x86 for 4.8-2

[GIT PULL] platform-drivers-x86 for 4.8-2

[Darren Hart]

Hi Linus,

The following changes since commit 332e081225fc2a657aa587c42943d5f5a7dae88b:

  intel-vbtn: new driver for Intel Virtual Button (2016-07-22 13:17:40 -0700)

are available in the git repository at:

  git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git tags/platform-drivers-x86-v4.8-2

for you to fetch changes up to c37636b450aebcefbceeca3c19fb0eb804d3050f:

  dell-wmi: Ignore WMI event 0xe00e (2016-07-27 10:11:51 -0700)

Thanks,

Darren Hart
Intel Open Source Technology Center

----------------------------------------------------------------
platform-drivers-x86 for 4.8-2

Minor platform specific event handling updates and a Kconfig cleanup.

dell-wmi:
 - Ignore WMI event 0xe00e

platform/x86:
 - Drop duplicate dependencies on X86

thinkpad_acpi:
 - Add support for HKEY version 0x200

ideapad_laptop:
 - Add an event for mic mute hotkey

----------------------------------------------------------------
Alex Hung (1):
      ideapad_laptop: Add an event for mic mute hotkey

Dennis Wassenberg (1):
      thinkpad_acpi: Add support for HKEY version 0x200

Jean Delvare (1):
      platform/x86: Drop duplicate dependencies on X86

Pali Rohár (1):
      dell-wmi: Ignore WMI event 0xe00e

 drivers/platform/x86/Kconfig          | 10 ++--
 drivers/platform/x86/dell-wmi.c       |  4 +-
 drivers/platform/x86/ideapad-laptop.c |  2 +
 drivers/platform/x86/thinkpad_acpi.c  | 87 +++++++++++++++++++++++++----------
 4 files changed, 71 insertions(+), 32 deletions(-)

-- 
Darren Hart
Intel Open Source Technology Center

Re: [GIT PULL] platform-drivers-x86 for 4.8-2

[Linus Torvalds]

On Fri, Aug 5, 2016 at 6:51 PM, Darren Hart <dvhart@infradead.org> wrote:
>
> Minor platform specific event handling updates and a Kconfig cleanup.

No. You already sent a *different* copy of all of these except for the
dell-wmi one in a previous pull requests.

This pull request gets me four new commits, but three of them I
already had. From you.

See for example your new commit

  2dd73625dedc platform/x86: Drop duplicate dependencies on X86

vs

  25789f95a883 platform/x86: Drop duplicate dependencies on X86

which are identical patches, just different dates.

Why should I pull a branch that is this confused?

It's not like I got those patches from somebody else, and there was
just a mis-communication about who should apply them. They were both
from *you*. That old commit came in in 4.7-rc4, so it's not even all
that recent.

              Linus

Re: [GIT PULL] platform-drivers-x86 for 4.8-2

[Darren Hart]

On Fri, Aug 05, 2016 at 11:23:09PM -0400, Linus Torvalds wrote:
> On Fri, Aug 5, 2016 at 6:51 PM, Darren Hart <dvhart@infradead.org> wrote:
> >
> > Minor platform specific event handling updates and a Kconfig cleanup.
> 
> No. You already sent a *different* copy of all of these except for the
> dell-wmi one in a previous pull requests.

Well that is pretty terrible on my part. I screwed up in my management of my
fixes branch.  I'll dig through this to make sure I didn't mess up anything else
and submit a new pull request for anything missing.

Apologies Linus.

> 
> This pull request gets me four new commits, but three of them I
> already had. From you.
> 
> See for example your new commit
> 
>   2dd73625dedc platform/x86: Drop duplicate dependencies on X86
> 
> vs
> 
>   25789f95a883 platform/x86: Drop duplicate dependencies on X86
> 
> which are identical patches, just different dates.
> 
> Why should I pull a branch that is this confused?
> 
> It's not like I got those patches from somebody else, and there was
> just a mis-communication about who should apply them. They were both
> from *you*. That old commit came in in 4.7-rc4, so it's not even all
> that recent.
> 
>               Linus
> 

-- 
Darren Hart
Intel Open Source Technology Center

Re: [GIT PULL] platform-drivers-x86 for 4.8-2

[Darren Hart]

On Mon, Aug 08, 2016 at 09:54:42AM -0700, Darren Hart wrote:
> On Fri, Aug 05, 2016 at 11:23:09PM -0400, Linus Torvalds wrote:
> > On Fri, Aug 5, 2016 at 6:51 PM, Darren Hart <dvhart@infradead.org> wrote:
> > >
> > > Minor platform specific event handling updates and a Kconfig cleanup.
> > 
> > No. You already sent a *different* copy of all of these except for the
> > dell-wmi one in a previous pull requests.
> 
> Well that is pretty terrible on my part. I screwed up in my management of my
> fixes branch.  I'll dig through this to make sure I didn't mess up anything else
> and submit a new pull request for anything missing.
> 
> Apologies Linus.

I identified what I did wrong and have updated my process and my tooling. While
this should never happen, if it does, my tagging script now performs a "git
cherry -v master $TAG" which will catch any previously merged commits, and
aborts.

New pull request with just the one patch momentarily.

Sorry for the noise, and thank you for catching it.

-- 
Darren Hart
Intel Open Source Technology Center