Messages in this thread | | | Date | Wed, 22 Aug 2012 14:27:22 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rcu tree with the tip tree |
| |
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. -- 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 [unhandled content-type:application/pgp-signature] | |