lkml.org 
[lkml]   [2019]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm-current tree with Linus' tree
Hi all,

On Mon, 18 Feb 2019 17:51:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/binfmt_script.c
>
> between commit:
>
> cb5b020a8d38 ("Revert "exec: load_script: don't blindly truncate shebang string"")
>
> from Linus' tree and commit:
>
> 76b21f3b9c4d ("exec: load_script: allow interpreter argument truncation")
>
> from the akpm-current tree.

Since Linus has applied something similar to his tree, I have dropped
that latter patch from the akpm-current tree from today.
--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-02-20 02:00    [W:0.056 / U:1.116 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site