| Message ID | 20191125105843.2bdea309@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the bpf-next tree with the net-next tree | expand |
On Sun, Nov 24, 2019 at 3:58 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > kernel/bpf/syscall.c > > between commit: > > 84bb46cd6228 ("Revert "bpf: Emit audit messages upon successful prog load and unload"") > > from the net-next tree and commit: > > 8793e6b23b1e ("bpf: Move bpf_free_used_maps into sleepable section") > > from the bpf-next tree. argh. I wonder whether individual reverts would have helped git to avoid such conflict. Anyhow I've rebased bpf-next on top of net-next to avoid this mess. There was only one Fixes tag that I adjusted manually.
diff --cc kernel/bpf/syscall.c index 4ae52eb05f41,bb002f15b32a..000000000000 --- a/kernel/bpf/syscall.c
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: kernel/bpf/syscall.c between commit: 84bb46cd6228 ("Revert "bpf: Emit audit messages upon successful prog load and unload"") from the net-next tree and commit: 8793e6b23b1e ("bpf: Move bpf_free_used_maps into sleepable section") 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.