linux-kernel - Re: linux-next: manual merge of the net-next tree with the bpf 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 for Android: free password hash cracker in your pocket

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

Message-ID: <1774afa4-5b21-61f1-e921-4102a1950771@fb.com>
Date:   Tue, 31 Jul 2018 21:23:46 -0700
From:   Yonghong Song <yhs@...com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>
CC:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Okash Khawaja <osk@...com>
Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree



On 7/31/18 6:35 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>    tools/bpf/bpftool/map.c
> 
> between commit:
> 
>    573b3aa69406 ("tools/bpftool: fix a percpu_array map dump problem")
> 
> from the bpf tree and commit:
> 
>    2d3feca8c44f ("bpf: btf: print map dump and lookup with btf info")
> 
> from the net-next tree.

The merge looks good to me. Thanks!

> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>