Messages in this thread | | | Date | Fri, 28 Sep 2012 14:39:40 +0200 | From | Frederic Weisbecker <> | Subject | Re: linux-next: manual merge of the tip tree with the rr tree |
| |
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 finegrained irqtime accounting generally available") and > 2b1d5024e17b ("rcu: Settle config for userspace extended quiescent > state") from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good. Thanks.
| |