[lkml]   [2019]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the bpf-next tree with the net-next tree
On Sun, Nov 24, 2019 at 3:58 PM Stephen Rothwell <> 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.

 \ /
  Last update: 2019-11-25 02:20    [W:0.029 / U:5.600 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site