* linux-next: manual merge of the uprobes tree with Linus' tree
@ 2012-02-28 2:43 Stephen Rothwell
2012-02-28 5:34 ` Srikar Dronamraju
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-02-28 2:43 UTC (permalink / raw)
To: Srikar Dronamraju; +Cc: linux-next, linux-kernel, Jim Keniston, Oleg Nesterov
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
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>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the uprobes tree with Linus' tree
2012-02-28 2:43 linux-next: manual merge of the uprobes tree with Linus' tree Stephen Rothwell
@ 2012-02-28 5:34 ` Srikar Dronamraju
0 siblings, 0 replies; 2+ messages in thread
From: Srikar Dronamraju @ 2012-02-28 5:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jim Keniston, Oleg Nesterov
Hi Stephen,
> 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.
Okay, Thanks for letting me know.
I will fix this up accordingly.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-28 5:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-28 2:43 linux-next: manual merge of the uprobes tree with Linus' tree Stephen Rothwell
2012-02-28 5:34 ` Srikar Dronamraju
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).