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

2012-09-28 Thread Frederic Weisbecker
On Fri, Sep 28, 2012 at 01:33:41PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in arch/Kconfig > between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use > asm-generic/module.h") from the rr tree and commits fdf9c356502a > ("cputi

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

2012-09-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/x86/Kconfig between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use asm-generic/module.h") from the rr tree and commits fdf9c356502a ("cputime: Make finegrained irqtime accounting generally available") and edf55fda

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

2012-09-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/Kconfig between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use asm-generic/module.h") from the rr tree and commits fdf9c356502a ("cputime: Make finegrained irqtime accounting generally available") and 2b1d5024e17b

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

2012-08-23 Thread Frederic Weisbecker
On Thu, Aug 23, 2012 at 12:43:48PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in arch/Kconfig > between commit bd029f48459a ("Make most arch asm/module.h files use > asm-generic/module.h") from the rr tree and commit b952741c8079 > ("cputim

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

2012-08-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/Kconfig between commit bd029f48459a ("Make most arch asm/module.h files use asm-generic/module.h") from the rr tree and commit b952741c8079 ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") from the tip tree. Just context ch