Messages in this thread | | | Date | Tue, 28 Feb 2012 13:43:19 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the uprobes tree with Linus' tree |
| |
Hi Srikar,
Today's linux-next merge of the uprobes tree got a conflict in kernel/fork.c between commit d80e731ecab4 ("epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()") from Linus' tree and commit 1f9eb65410a6 ("uprobes/core: handle breakpoint and signal step exception") from the uprobes 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/fork.c index 14dac32,df711bb..0000000 --- a/kernel/fork.c +++ b/kernel/fork.c @@@ -66,7 -66,7 +66,8 @@@ #include <linux/user-return-notifier.h> #include <linux/oom.h> #include <linux/khugepaged.h> +#include <linux/signalfd.h> + #include <linux/uprobes.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> [unhandled content-type:application/pgp-signature] | |