Re: linux-next: manual merge of the kselftest tree with the net-next tree

From: Shuah Khan
Date: Tue Jan 24 2017 - 10:17:37 EST

On 01/23/2017 09:45 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:
> 4d3381f5a322 ("bpf: Add tests for the lpm trie map")
> 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.

Yes. Please.

> P.S. Shuah, that kselftest commit has a different email address in its
> Author and Signed-off-by.

Yes you are right. I didn't notice the discrepancy.

Bamvor! Your gitconfig is outdated perhaps!

-- Shuah