netdev - Re: linux-next: manual merge of the kselftest 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: <a7dfa6bf-1bcb-aa44-4099-a86caf5f1f5a@osg.samsung.com>
Date:   Wed, 22 Feb 2017 07:54:21 -0700
From:   Shuah Khan <shuahkh@....samsung.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        "bamvor.zhangjian@...wei.com" <bamvor.zhangjian@...wei.com>,
        Mickaël Salaün <mic@...ikod.net>,
        Shuah Khan <shuahkh@....samsung.com>
Subject: Re: linux-next: manual merge of the kselftest tree with the net-next
 tree

On 02/15/2017 08:24 PM, Stephen Rothwell wrote:
> Hi Shuah,
> 
> Today's linux-next merge of the kselftest tree got a conflict in:
> 
>   tools/testing/selftests/bpf/Makefile
> 
> between commit:
> 
>   d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update")
> 
> from the net-next tree and commit:
> 
>   88baa78d1f31 ("selftests: remove duplicated all and clean target")
> 
> from the kselftest tree.
> 
> 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.
> 


Sorry to get back to you late. I was away on vacation last week.
Yes. Please let's plan upon carrying the fix.

thanks,
-- Shuah