lkml.org 
[lkml]   [2012]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the uprobes tree with Linus' tree
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.



\
 
 \ /
  Last update: 2012-02-28 06:39    [W:0.040 / U:2.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site