Messages in this thread | | | Subject | Re: linux-next: manual merge of the bpf-next tree with the bpf tree | From | Daniel Borkmann <> | Date | Mon, 26 Feb 2018 10:03:49 +0100 |
| |
On 02/26/2018 01:41 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > tools/testing/selftests/bpf/test_verifier.c > > between commit: > > ca36960211eb ("bpf: allow xadd only on aligned memory") > > from the bpf tree and commit: > > 23d191a82c13 ("bpf: add various jit test cases") > > from the bpf-next 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.
Looks good, thanks!
| |