| Message ID | 20200803130526.5a1519e2@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 net/core/dev.c index f7ef0f5c5569,c8b911b10187..000000000000 --- a/net/core/dev.c
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: net/core/dev.c between commit: 829eb208e80d ("rtnetlink: add support for protodown reason") from the net-next tree and commits: 7f0a838254bd ("bpf, xdp: Maintain info on attached XDP BPF programs in net_device") aa8d3a716b59 ("bpf, xdp: Add bpf_link-based XDP attachment API") 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.