Re: linux-next: manual merge of the signal tree with the modules and arm-soc trees

2012-10-04 Thread Arnd Bergmann
On Thursday 04 October 2012, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the signal tree got conflicts in > arch/avr32/include/asm/Kbuild, arch/cris/include/asm/Kbuild, > arch/frv/include/asm/Kbuild, arch/h8300/include/asm/Kbuild, > arch/ia64/include/asm/Kbuild,

Re: linux-next: manual merge of the signal tree with the modules and arm-soc trees

2012-10-04 Thread Arnd Bergmann
On Thursday 04 October 2012, Stephen Rothwell wrote: Hi Al, Today's linux-next merge of the signal tree got conflicts in arch/avr32/include/asm/Kbuild, arch/cris/include/asm/Kbuild, arch/frv/include/asm/Kbuild, arch/h8300/include/asm/Kbuild, arch/ia64/include/asm/Kbuild,

linux-next: manual merge of the signal tree with the modules and arm-soc trees

2012-10-03 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the signal tree got conflicts in arch/avr32/include/asm/Kbuild, arch/cris/include/asm/Kbuild, arch/frv/include/asm/Kbuild, arch/h8300/include/asm/Kbuild, arch/ia64/include/asm/Kbuild, arch/m32r/include/asm/Kbuild, arch/microblaze/include/asm/Kbuild,

linux-next: manual merge of the signal tree with the modules and arm-soc trees

2012-10-03 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the signal tree got conflicts in arch/avr32/include/asm/Kbuild, arch/cris/include/asm/Kbuild, arch/frv/include/asm/Kbuild, arch/h8300/include/asm/Kbuild, arch/ia64/include/asm/Kbuild, arch/m32r/include/asm/Kbuild, arch/microblaze/include/asm/Kbuild,