| Message ID | 20200721121200.60ce87fb@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 |
diff --cc include/linux/filter.h index 4d049c8e1fbe,8252572db918..000000000000 --- a/include/linux/filter.h
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: include/linux/filter.h between commit: 4d295e546115 ("net: simplify cBPF setsockopt compat handling") from the net-next tree and commits: e9ddbb7707ff ("bpf: Introduce SK_LOOKUP program type with a dedicated attach point") 1559b4aa1db4 ("inet: Run SK_LOOKUP BPF program on socket lookup") 1122702f0267 ("inet6: Run SK_LOOKUP BPF program on socket lookup") 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.