Hi all,
On Mon, 18 Feb 2019 17:51:20 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
Attachment:
pgptd_vWslYJe.pgp
Description: OpenPGP digital signature
