Messages in this thread | | | Date | Tue, 21 Aug 2012 22:03:38 -0700 | From | "Paul E. McKenney" <> | Subject | Re: linux-next: manual merge of the rcu tree with the tip tree |
| |
On Wed, Aug 22, 2012 at 02:27:22PM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in > kernel/rcutree_plugin.h between commit 62ab7072476a ("rcu: Use > smp_hotplug_thread facility for RCUs per-CPU kthread") from the tip tree > and commit 8732d57a8ce0 ("rcu: Provide OOM handler to motivate lazy RCU > callbacks") from the rcu tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
The fix looks correct to me!
Thanx, Paul
> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc kernel/rcutree_plugin.h > index c1961ae,c3e3fc4..0000000 > --- a/kernel/rcutree_plugin.h > +++ b/kernel/rcutree_plugin.h > @@@ -25,7 -25,7 +25,8 @@@ > */ > > #include <linux/delay.h> > +#include <linux/smpboot.h> > + #include <linux/oom.h> > > #define RCU_KTHREAD_PRIO 1 >
| |