Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1566361

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

Show all headers | View raw

On 01/25/2017 05:03 AM, 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:
>
>    62b64660262a ("bpf: add prog tag test case to bpf selftests")
>
> 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.

Looks good to me, thanks!

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the kselftest tree with the net-next  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-25 05:10 +0100
  Re: linux-next: manual merge of the kselftest tree with the net-next  tree Daniel Borkmann <daniel@iogearbox.net> - 2017-01-25 08:40 +0100

csiph-web