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 co
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:
88baa78d
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:
>
