linux-kernel - Re: linux-next: manual merge of the tip tree with the net-next 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: <20191018050013.sle55bwea5kxovej@ast-mbp>
Date:   Thu, 17 Oct 2019 22:00:15 -0700
From:   Alexei Starovoitov <alexei.starovoitov@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Björn Töpel <bjorn.topel@...el.com>,
        Arnaldo Carvalho de Melo <acme@...hat.com>,
        Ivan Khoronzhuk <ivan.khoronzhuk@...aro.org>,
        Alexei Starovoitov <ast@...nel.org>
Subject: Re: linux-next: manual merge of the tip tree with the net-next tree

On Fri, Oct 18, 2019 at 01:31:39PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   samples/bpf/Makefile
> 
> between commit:
> 
>   1d97c6c2511f ("samples/bpf: Base target programs rules on Makefile.target")
> 
> from the net-next tree and commit:
> 
>   fce9501aec6b ("samples/bpf: fix build by setting HAVE_ATTR_TEST to zero")
> 
> from the tip tree.

Argh.
Can tip folks revert the patch and let it go the normal route via bpf trees?
There was no good reason in creating such conflicts.