| Message ID | 20200310110612.611ab9ad@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
diff --cc net/ipv4/inet_diag.c index 8c8377568a78,e1cad25909df..000000000000 --- a/net/ipv4/inet_diag.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/inet_diag.c between commit: 83f73c5bb7b9 ("inet_diag: return classid for all socket types") from the net tree and commit: 085c20cacf2b ("bpf: inet_diag: Dump bpf_sk_storages in inet_diag_dump()") from the net-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.