| Message ID | 20190703204921.69bc9074@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the akpm tree with the net-next tree | expand |
diff --cc net/ipv6/sysctl_net_ipv6.c index 57f520d1bf45,e00cf070e542..000000000000 --- a/net/ipv6/sysctl_net_ipv6.c
Hi all, Today's linux-next merge of the akpm tree got a conflict in: net/ipv6/sysctl_net_ipv6.c between commit: 00dc3307c0f7 ("net/ipv6: Fix misuse of proc_dointvec "flowlabel_reflect"") from the net-next tree and patch: "proc-sysctl-add-shared-variables-for-range-check-fix-2-fix" from the akpm 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.