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
>
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
(cputime: Make
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
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
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
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
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
>
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
(cputime:
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
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
10 matches
Mail list logo