lkml.org 
[lkml]   [2017]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the kselftest tree with the net-next tree
From
Date
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

\
 
 \ /
  Last update: 2017-02-22 15:55    [W:2.642 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site