Re: [GIT PULL] x86 PTI and Spectre related fixes and updates

2018-02-15 Thread Linus Torvalds
On Wed, Feb 14, 2018 at 9:48 PM, Greg Kroah-Hartman wrote: > > I do use it, I take the commits from there and then queue them up as > individual patches for the stable releases. > > And if it wasn't there, the conflict resolution would have to be on my > side, making them "not the same commits in

Re: [GIT PULL] x86 PTI and Spectre related fixes and updates

2018-02-15 Thread Ingo Molnar
* Ingo Molnar wrote: > > > This is not a complaint so much as a "is it worth it?" question.. > > > > So far, I think this is the first conflict it's generated in a long > > time, so previously it was worth it from my point of view. As long as > > it doesn't cause more work for the TIP maintain

Re: [GIT PULL] x86 PTI and Spectre related fixes and updates

2018-02-15 Thread Ingo Molnar
* Greg Kroah-Hartman wrote: > On Wed, Feb 14, 2018 at 05:17:25PM -0800, Linus Torvalds wrote: > > On Wed, Feb 14, 2018 at 4:38 PM, Ingo Molnar wrote: > > > > > >This tree generates two relatively simple conflicts with your tree: > > > > So what annoys me about these conflicts is that I'm n

Re: [GIT PULL] x86 PTI and Spectre related fixes and updates

2018-02-14 Thread Greg Kroah-Hartman
On Wed, Feb 14, 2018 at 05:17:25PM -0800, Linus Torvalds wrote: > On Wed, Feb 14, 2018 at 4:38 PM, Ingo Molnar wrote: > > > >This tree generates two relatively simple conflicts with your tree: > > So what annoys me about these conflicts is that I'm not convinced that > the stable tree actuall

Re: [GIT PULL] x86 PTI and Spectre related fixes and updates

2018-02-14 Thread Linus Torvalds
On Wed, Feb 14, 2018 at 4:38 PM, Ingo Molnar wrote: > >This tree generates two relatively simple conflicts with your tree: So what annoys me about these conflicts is that I'm not convinced that the stable tree actually *uses* your fancy x86/pti branch? I think stable ends up working like a p

[GIT PULL] x86 PTI and Spectre related fixes and updates

2018-02-14 Thread Ingo Molnar
Linus, Please consider pulling the latest x86-pti-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-pti-for-linus # HEAD: 48753793350974b7afe9598fd1dc46b2f1f47c2d x86/entry/64: Fix CR3 restore in paranoid_exit() Here's the latest set of Spectre and PT