Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On Tue, 16 Jan 2018, Paolo Bonzini wrote: > On 16/01/2018 01:55, Ingo Molnar wrote: > > > > * Paolo Bonzini wrote: > > > >> On 15/01/2018 19:36, Thomas Gleixner wrote: > Can KVM folks please stop doing random changes to the cpufeatures code > without talking to

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On Tue, 16 Jan 2018, Paolo Bonzini wrote: > On 16/01/2018 01:55, Ingo Molnar wrote: > > > > * Paolo Bonzini wrote: > > > >> On 15/01/2018 19:36, Thomas Gleixner wrote: > Can KVM folks please stop doing random changes to the cpufeatures code > without talking to x86 maintainers and

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On 16/01/2018 01:55, Ingo Molnar wrote: > > * Paolo Bonzini wrote: > >> On 15/01/2018 19:36, Thomas Gleixner wrote: Can KVM folks please stop doing random changes to the cpufeatures code without talking to x86 maintainers and Borislav? This wants to go

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On 16/01/2018 01:55, Ingo Molnar wrote: > > * Paolo Bonzini wrote: > >> On 15/01/2018 19:36, Thomas Gleixner wrote: Can KVM folks please stop doing random changes to the cpufeatures code without talking to x86 maintainers and Borislav? This wants to go through TIP or at

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

* Paolo Bonzini wrote: > On 15/01/2018 19:36, Thomas Gleixner wrote: > >> Can KVM folks please stop doing random changes to the cpufeatures code > >> without talking to x86 maintainers and Borislav? > >> > >> This wants to go through TIP or at least reviewed and acked. > >

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

* Paolo Bonzini wrote: > On 15/01/2018 19:36, Thomas Gleixner wrote: > >> Can KVM folks please stop doing random changes to the cpufeatures code > >> without talking to x86 maintainers and Borislav? > >> > >> This wants to go through TIP or at least reviewed and acked. > > In fact it needs to

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On 15/01/2018 19:36, Thomas Gleixner wrote: >> Can KVM folks please stop doing random changes to the cpufeatures code >> without talking to x86 maintainers and Borislav? >> >> This wants to go through TIP or at least reviewed and acked. > In fact it needs to go through TIP. We spent a lot of

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On 15/01/2018 19:36, Thomas Gleixner wrote: >> Can KVM folks please stop doing random changes to the cpufeatures code >> without talking to x86 maintainers and Borislav? >> >> This wants to go through TIP or at least reviewed and acked. > In fact it needs to go through TIP. We spent a lot of

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On Mon, 15 Jan 2018, Thomas Gleixner wrote: > On Mon, 15 Jan 2018, Stephen Rothwell wrote: > > Hi all, > > --- a/arch/x86/include/asm/cpufeatures.h > > +++ b/arch/x86/include/asm/cpufeatures.h > > @@@ -202,11 -201,9 +202,11 @@@ > > #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On Mon, 15 Jan 2018, Thomas Gleixner wrote: > On Mon, 15 Jan 2018, Stephen Rothwell wrote: > > Hi all, > > --- a/arch/x86/include/asm/cpufeatures.h > > +++ b/arch/x86/include/asm/cpufeatures.h > > @@@ -202,11 -201,9 +202,11 @@@ > > #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On Mon, 15 Jan 2018, Stephen Rothwell wrote: > Hi all, > --- a/arch/x86/include/asm/cpufeatures.h > +++ b/arch/x86/include/asm/cpufeatures.h > @@@ -202,11 -201,9 +202,11 @@@ > #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ > #define X86_FEATURE_PROC_FEEDBACK (

Re: linux-next: manual merge of the kvm tree with Linus' and the tip trees

On Mon, 15 Jan 2018, Stephen Rothwell wrote: > Hi all, > --- a/arch/x86/include/asm/cpufeatures.h > +++ b/arch/x86/include/asm/cpufeatures.h > @@@ -202,11 -201,9 +202,11 @@@ > #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ > #define X86_FEATURE_PROC_FEEDBACK (

linux-next: manual merge of the kvm tree with Linus' and the tip trees

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/include/asm/cpufeatures.h between commit: a89f040fa34e ("x86/cpufeatures: Add X86_BUG_CPU_INSECURE") from Linus' tree, commit: 76b043848fd2 ("x86/retpoline: Add initial retpoline support") from the tip tree

linux-next: manual merge of the kvm tree with Linus' and the tip trees

Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/include/asm/cpufeatures.h between commit: a89f040fa34e ("x86/cpufeatures: Add X86_BUG_CPU_INSECURE") from Linus' tree, commit: 76b043848fd2 ("x86/retpoline: Add initial retpoline support") from the tip tree