Re: linux-next: manual merge of the m68knommu tree with the tree

2012-10-18 Thread Geert Uytterhoeven
Hi Greg, On Thu, Oct 18, 2012 at 12:01 PM, Greg Ungerer wrote: > On 10/18/2012 03:51 PM, Geert Uytterhoeven wrote: >> On Thu, Oct 18, 2012 at 5:34 AM, Greg Ungerer wrote: >>> On 18/10/12 09:38, Stephen Rothwell wrote: On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell wrote: >>>

Re: linux-next: manual merge of the m68knommu tree with the tree

2012-10-18 Thread Greg Ungerer
Hi Geert, On 10/18/2012 03:51 PM, Geert Uytterhoeven wrote: Hi Greg, On Thu, Oct 18, 2012 at 5:34 AM, Greg Ungerer wrote: On 18/10/12 09:38, Stephen Rothwell wrote: [Just cc'ing Geert] On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the

Re: linux-next: manual merge of the m68knommu tree with the tree

2012-10-17 Thread Geert Uytterhoeven
Hi Greg, On Thu, Oct 18, 2012 at 5:34 AM, Greg Ungerer wrote: > On 18/10/12 09:38, Stephen Rothwell wrote: >> >> [Just cc'ing Geert] >> >> On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell >> wrote: >>> >>> >>> Hi Greg, >>> >>> Today's linux-next merge of the m68knommu tree got conflicts in >>

Re: linux-next: manual merge of the m68knommu tree with the tree

2012-10-17 Thread Greg Ungerer
Hi Stephen, On 18/10/12 09:38, Stephen Rothwell wrote: [Just cc'ing Geert] On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the m68knommu tree got conflicts in arch/m68k/include/asm/termios.h, arch/m68k/include/uapi/asm/auxvec.h, arch/m68k/inc

Re: linux-next: manual merge of the m68knommu tree with the tree

2012-10-17 Thread Stephen Rothwell
[Just cc'ing Geert] On Thu, 18 Oct 2012 10:37:13 +1100 Stephen Rothwell wrote: > > Hi Greg, > > Today's linux-next merge of the m68knommu tree got conflicts in > arch/m68k/include/asm/termios.h, arch/m68k/include/uapi/asm/auxvec.h, > arch/m68k/include/uapi/asm/msgbuf.h, arch/m68k/include/uapi/a