linux-kernel - Re: linux-next: manual merge of the akpm-current tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190220120000.741f5c09@canb.auug.org.au>
Date:   Wed, 20 Feb 2019 12:00:00 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kees Cook <keescook@...omium.org>
Subject: Re: 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@...b.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

Content of type "application/pgp-signature" skipped