| Message ID | 20200331114005.5e2fc6f7@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the bpf-next tree with Linus' tree | expand |
diff --cc kernel/bpf/cgroup.c index 4f1472409ef8,80676fc00d81..000000000000 --- a/kernel/bpf/cgroup.c
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: kernel/bpf/cgroup.c between commit: 62039c30c19d ("bpf: Initialize storage pointers to NULL to prevent freeing garbage pointer") from Linus' tree and commits: 00c4eddf7ee5 ("bpf: Factor out cgroup storages operations") 72ae26452e77 ("bpf: Implement bpf_link-based cgroup BPF program attachment") 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.