2012-05-21 08:14:00

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the akpm tree with Linus' tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/base.c between commit eb94cd96e05d ("fs, proc: fix ABBA deadlock
in case of execution attempt of map_files/ entries") from Linus' tree and
commit "proc: unify ptrace_may_access() locking code" from the akpm tree.

I used the version of the conflicting code from Linus' tree.
--
Cheers,
Stephen Rothwell [email protected]

Attachments:
(No filename) (424.00 B)
 (No filename) (836.00 B)
 Download all attachments

2012-05-21 08:16:54

by Cyrill Gorcunov

[permalink] [raw]
Subject: Re: linux-next: manual merge of the akpm tree with Linus' tree

On Mon, May 21, 2012 at 06:13:47PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> fs/proc/base.c between commit eb94cd96e05d ("fs, proc: fix ABBA deadlock
> in case of execution attempt of map_files/ entries") from Linus' tree and
> commit "proc: unify ptrace_may_access() locking code" from the akpm tree.
>
> I used the version of the conflicting code from Linus' tree.

Hi Stephen, gimme some time to take a look on...

Cyrill