Re: [GIT PULL] platform-drivers-x86 for 5.1-1

2019-03-10 Thread Darren Hart
On Sun, Mar 10, 2019 at 01:22:24PM -0700, Linus Torvalds wrote: > On Fri, Mar 8, 2019 at 12:33 PM Darren Hart wrote: > > > > The wmi mod alias changes collide with a similar series for TEE based > > devices. > > Anyway, you also used a *very* new subkey. Can you please mention it, > so that I do

Re: [GIT PULL] platform-drivers-x86 for 5.1-1

2019-03-10 Thread pr-tracker-bot
The pull request you sent on Fri, 8 Mar 2019 12:33:26 -0800: > git://git.infradead.org/linux-platform-drivers-x86.git pdx86-5.1-1-merge has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/dbbdf54c7206bf3f201f9ddaa5f4dd87835271cc Thank you! -- Deet-doot-dot, I am a bot. h

Re: [GIT PULL] platform-drivers-x86 for 5.1-1

2019-03-10 Thread Linus Torvalds
On Fri, Mar 8, 2019 at 12:33 PM Darren Hart wrote: > > The wmi mod alias changes collide with a similar series for TEE based devices. Anyway, you also used a *very* new subkey. Can you please mention it, so that I don't then get taken by surprise when I find a key that was used to sign this and I

[GIT PULL] platform-drivers-x86 for 5.1-1

2019-03-08 Thread Darren Hart
Hi Linus, The wmi mod alias changes collide with a similar series for TEE based devices. I have provided my merge resolution here: git://git.infradead.org/linux-platform-drivers-x86.git pdx86-5.1-1-merge This series includes two previously merged patches from the RC cycle: - 522e4ee6e5 Documen