| Message ID | 20191018133139.30c88807@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the tip tree with the net-next tree | expand |
diff --cc samples/bpf/Makefile index 4df11ddb9c75,42b571cde177..000000000000 --- a/samples/bpf/Makefile
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. 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.