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

Groups > linux.kernel > #1586223

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

Show all headers | View raw

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

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-02-16 04:30 +0100
  Re: linux-next: manual merge of the kselftest tree with the net-next  tree Shuah Khan <shuahkh@osg.samsung.com> - 2017-02-22 16:00 +0100

csiph-web