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

2014-12-08 Thread Ingo Molnar
* j...@joshtriplett.org wrote: > On Tue, Nov 25, 2014 at 11:10:44AM +0100, Ingo Molnar wrote: > > * Josh Triplett wrote: > > > On Tue, Nov 25, 2014 at 07:16:45AM +0100, Ingo Molnar wrote: > > > > * Stephen Rothwell wrote: > > > > > Hi Josh, > > > > > > > > > > Today's linux-next merge of the

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

2014-11-25 Thread josh
On Tue, Nov 25, 2014 at 11:10:44AM +0100, Ingo Molnar wrote: > * Josh Triplett wrote: > > On Tue, Nov 25, 2014 at 07:16:45AM +0100, Ingo Molnar wrote: > > > * Stephen Rothwell wrote: > > > > Hi Josh, > > > > > > > > Today's linux-next merge of the tiny tree got a conflict in > > > > kernel/time/

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

2014-11-25 Thread Ingo Molnar
* Josh Triplett wrote: > On Tue, Nov 25, 2014 at 07:16:45AM +0100, Ingo Molnar wrote: > > * Stephen Rothwell wrote: > > > Hi Josh, > > > > > > Today's linux-next merge of the tiny tree got a conflict in > > > kernel/time/Makefile between commit fd866e2b116b ("time: Rename > > > udelay_test.c t

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

2014-11-24 Thread Josh Triplett
On Mon, Nov 24, 2014 at 10:30:10PM -0800, John Stultz wrote: > On Mon, Nov 24, 2014 at 10:16 PM, Ingo Molnar wrote: > > > > * Stephen Rothwell wrote: > > > >> Hi Josh, > >> > >> Today's linux-next merge of the tiny tree got a conflict in > >> kernel/time/Makefile between commit fd866e2b116b ("tim

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

2014-11-24 Thread Josh Triplett
On Tue, Nov 25, 2014 at 07:16:45AM +0100, Ingo Molnar wrote: > * Stephen Rothwell wrote: > > Hi Josh, > > > > Today's linux-next merge of the tiny tree got a conflict in > > kernel/time/Makefile between commit fd866e2b116b ("time: Rename > > udelay_test.c to test_udelay.c") from the tip tree and

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

2014-11-24 Thread John Stultz
On Mon, Nov 24, 2014 at 10:16 PM, Ingo Molnar wrote: > > * Stephen Rothwell wrote: > >> Hi Josh, >> >> Today's linux-next merge of the tiny tree got a conflict in >> kernel/time/Makefile between commit fd866e2b116b ("time: Rename >> udelay_test.c to test_udelay.c") from the tip tree and commit >>

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

2014-11-24 Thread Ingo Molnar
* Stephen Rothwell wrote: > Hi Josh, > > Today's linux-next merge of the tiny tree got a conflict in > kernel/time/Makefile between commit fd866e2b116b ("time: Rename > udelay_test.c to test_udelay.c") from the tip tree and commit > d1f6d68d03ea ("kernel: time: Compile out NTP support") from th

linux-next: manual merge of the tiny tree with the tip tree

2014-11-24 Thread Stephen Rothwell
Hi Josh, Today's linux-next merge of the tiny tree got a conflict in kernel/time/Makefile between commit fd866e2b116b ("time: Rename udelay_test.c to test_udelay.c") from the tip tree and commit d1f6d68d03ea ("kernel: time: Compile out NTP support") from the tiny tree. I fixed it up (see below) a

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

2014-10-29 Thread Josh Triplett
On Tue, Sep 23, 2014 at 10:36:03AM +0200, Ingo Molnar wrote: > * Josh Triplett wrote: > > I've dropped tiny/no-io from tiny/next; I'll poke at it further > > and resubmit for the x86 tree later, likely not for the next > > merge window at this point. > > > > Thanks for the feedback on process;

linux-next: manual merge of the tiny tree with the tip tree

2014-09-25 Thread Stephen Rothwell
Hi Josh, Today's linux-next merge of the tiny tree got a conflict in arch/x86/boot/compressed/Makefile between commit 84be880560fb ("Revert "efi/x86: efistub: Move shared dependencies to "") from the tip tree and commit 9a1cb47112ef ("x86, boot: Use the usual -y -n mechanism for objects in vmlinux

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

2014-09-23 Thread Ingo Molnar
* Josh Triplett wrote: > On Tue, Sep 23, 2014 at 07:43:28AM +0200, Ingo Molnar wrote: > > * Stephen Rothwell wrote: > > > Today's linux-next merge of the tiny tree got conflicts in > > > arch/x86/kernel/process_32.c and arch/x86/kernel/process_64.c between > > > commits dc56c0f9b870 ("x86, fpu:

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

2014-09-22 Thread Josh Triplett
On Tue, Sep 23, 2014 at 07:43:28AM +0200, Ingo Molnar wrote: > * Stephen Rothwell wrote: > > Today's linux-next merge of the tiny tree got conflicts in > > arch/x86/kernel/process_32.c and arch/x86/kernel/process_64.c between > > commits dc56c0f9b870 ("x86, fpu: Shift "fpu_counter = 0" from > > co

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

2014-09-22 Thread Ingo Molnar
* Stephen Rothwell wrote: > Hi Josh, > > Today's linux-next merge of the tiny tree got conflicts in > arch/x86/kernel/process_32.c and arch/x86/kernel/process_64.c between > commits dc56c0f9b870 ("x86, fpu: Shift "fpu_counter = 0" from > copy_thread() to arch_dup_task_struct()") and 6f46b3aef00

linux-next: manual merge of the tiny tree with the tip tree

2014-09-22 Thread Stephen Rothwell
Hi Josh, Today's linux-next merge of the tiny tree got conflicts in arch/x86/kernel/process_32.c and arch/x86/kernel/process_64.c between commits dc56c0f9b870 ("x86, fpu: Shift "fpu_counter = 0" from copy_thread() to arch_dup_task_struct()") and 6f46b3aef003 ("x86: copy_thread: Don't nullify ->ptr

linux-next: manual merge of the tiny tree with the tip tree

2014-09-22 Thread Stephen Rothwell
Hi Josh, Today's linux-next merge of the tiny tree got a conflict in arch/x86/kernel/cpu/common.c between commit ce4b1b16502b ("x86/smpboot: Initialize secondary CPU only if master CPU will wait for it") from the tip tree and commit e4a191d1e05b ("x86: Support compiling out userspace I/O (iopl and