| Message ID | 20191119114333.757f8429@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 include/linux/bpf.h index 464f3f7e0b7a,e913dd5946ae..000000000000 --- a/include/linux/bpf.h diff --cc kernel/bpf/syscall.c index d447b5e343bf,bac3becf9f90..000000000000 --- a/kernel/bpf/syscall.c
Hi all, Today's linux-next merge of the bpf-next tree got conflicts in: include/linux/bpf.h kernel/bpf/syscall.c between commit: ff1c08e1f74b ("bpf: Change size to u64 for bpf_map_{area_alloc, charge_init}()") from Linus' tree and commit: fc9702273e2e ("bpf: Add mmap() support for BPF_MAP_TYPE_ARRAY") 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.