Re: linux-next: manual merge of the bpf-next tree with the bpf tree

From: Daniel Borkmann
Date: Thu Apr 26 2018 - 03:57:19 EST

On 04/26/2018 02:53 AM, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the bpf-next tree got a conflict in:
> samples/sockmap/Makefile
> between commit:
> 4dfe1bb95235 ("bpf: sockmap sample use clang flag, -target bpf")
> from the bpf tree and commit:
> 2e04eb1dd1ca ("bpf: sockmap, remove samples program")
> from the bpf-next tree.
> I fixed it up (I just removed the file) 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.

That's correct as well, thank you!