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

Alexei Starovoitov
2019-10-18T05:00:20Z

On Fri, Oct 18, 2019 at 01:31:39PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> samples/bpf/Makefile
>
> between commit:
>
> 1d97c6c2511f ("samples/bpf: Base target programs rules on Makefile.target")
>
> from the net-next tree and commit:
>
> fce9501aec6b ("samples/bpf: fix build by setting HAVE_ATTR_TEST to zero")
>
> from the tip tree.

Argh.
Can tip folks revert the patch and let it go the normal route via bpf trees?
There was no good reason in creating such conflicts.