Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-27 Thread Andy Lutomirski
On Tue, Jan 20, 2015 at 10:16 PM, Ingo Molnar wrote: > > * Andy Lutomirski wrote: > >> On Tue, Jan 20, 2015 at 9:55 PM, Ingo Molnar wrote: >> > >> > * Andy Lutomirski wrote: >> > >> >> On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: >> >> > >> >> > * Andy Lutomirski wrote: >> >> > >> >> >

Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Ingo Molnar
* Andy Lutomirski wrote: > On Tue, Jan 20, 2015 at 9:55 PM, Ingo Molnar wrote: > > > > * Andy Lutomirski wrote: > > > >> On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: > >> > > >> > * Andy Lutomirski wrote: > >> > > >> >> Hi Ingo and Thomas- > >> >> > >> >> There's a trivial conflict in

Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Ingo Molnar
* Andy Lutomirski wrote: > On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: > > > > * Andy Lutomirski wrote: > > > >> Hi Ingo and Thomas- > >> > >> There's a trivial conflict in the pull request I sent last week. > > > > This is your x86 entry code rework pull request, right? The -tip > > t

Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Andy Lutomirski
On Tue, Jan 20, 2015 at 9:55 PM, Ingo Molnar wrote: > > * Andy Lutomirski wrote: > >> On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: >> > >> > * Andy Lutomirski wrote: >> > >> >> Hi Ingo and Thomas- >> >> >> >> There's a trivial conflict in the pull request I sent last week. >> > >> > This

Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Andy Lutomirski
On Tue, Jan 20, 2015 at 9:48 PM, Andy Lutomirski wrote: > On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: >> >> * Andy Lutomirski wrote: >> >>> Hi Ingo and Thomas- >>> >>> There's a trivial conflict in the pull request I sent last week. >> >> This is your x86 entry code rework pull request,

Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Andy Lutomirski
On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: > > * Andy Lutomirski wrote: > >> Hi Ingo and Thomas- >> >> There's a trivial conflict in the pull request I sent last week. > > This is your x86 entry code rework pull request, right? The -tip > tree now has the RCU commit it depends on, so cou

Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Ingo Molnar
* Andy Lutomirski wrote: > Hi Ingo and Thomas- > > There's a trivial conflict in the pull request I sent last week. This is your x86 entry code rework pull request, right? The -tip tree now has the RCU commit it depends on, so could you please rebase it on top of tip:core/rcu so I can pull i

Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-20 Thread Andy Lutomirski
Hi Ingo and Thomas- There's a trivial conflict in the pull request I sent last week. --Andy -- Forwarded message -- From: Borislav Petkov Date: Mon, Jan 19, 2015 at 1:35 AM Subject: Re: linux-next: manual merge of the luto-misc tree with the tip tree To: Stephen Rothwel

Re: linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-19 Thread Borislav Petkov
On Mon, Jan 19, 2015 at 05:08:39PM +1100, Stephen Rothwell wrote: > Hi Andy, > > Today's linux-next merge of the luto-misc tree got a conflict in > arch/x86/kernel/cpu/mcheck/mce.c between commit 83737691e586 ("x86, > mce: Fix sparse errors") from the tip tree and commit d4812e169de4 > ("x86, mce:

linux-next: manual merge of the luto-misc tree with the tip tree

2015-01-18 Thread Stephen Rothwell
Hi Andy, Today's linux-next merge of the luto-misc tree got a conflict in arch/x86/kernel/cpu/mcheck/mce.c between commit 83737691e586 ("x86, mce: Fix sparse errors") from the tip tree and commit d4812e169de4 ("x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks") from the luto-misc tree