| Message ID | 20210408131117.7f2f3a29@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the bpf tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, Apr 7, 2021 at 8:11 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/core/skmsg.c > > between commit: > > 144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting") > > from the bpf tree and commit: > > e3526bb92a20 ("skmsg: Move sk_redir from TCP_SKB_CB to skb") > > from the net-next tree. > > I fixed it up (I think - 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. Looks good from my quick glance. Thanks!
diff --cc net/core/skmsg.c index 5def3a2e85be,92a83c02562a..000000000000 --- a/net/core/skmsg.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/core/skmsg.c between commit: 144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting") from the bpf tree and commit: e3526bb92a20 ("skmsg: Move sk_redir from TCP_SKB_CB to skb") from the net-next tree. I fixed it up (I think - 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.