Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the net-next tree with the bpf tree
@ 2021-04-08  3:02 Stephen Rothwell
  2021-04-08  3:50 ` [External] " Cong Wang .
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-04-08  3:02 UTC (permalink / raw)
  To: David Miller, Daniel Borkmann, Alexei Starovoitov, Networking
  Cc: Cong Wang, John Fastabend, Linux Kernel Mailing List,
	Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  include/linux/skmsg.h

between commit:

  1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset")

from the bpf tree and commit:

  8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")

from the net-next tree.

I didn't know how to fixed it up so I just used the latter version or
today - a better solution would be appreciated. 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [External] linux-next: manual merge of the net-next tree with the bpf tree
  2021-04-08  3:02 linux-next: manual merge of the net-next tree with the bpf tree Stephen Rothwell
@ 2021-04-08  3:50 ` Cong Wang .
  0 siblings, 0 replies; 3+ messages in thread
From: Cong Wang . @ 2021-04-08  3:50 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Daniel Borkmann, Alexei Starovoitov, Networking,
	John Fastabend, Linux Kernel Mailing List,
	Linux Next Mailing List

On Wed, Apr 7, 2021 at 8:02 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:
>
>   include/linux/skmsg.h
>
> between commit:
>
>   1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset")
>
> from the bpf tree and commit:
>
>   8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
>
> from the net-next tree.
>
> I didn't know how to fixed it up so I just used the latter version or
> today - a better solution would be appreciated. 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.

The right way to resolve this is to move the lines added in commit
1c84b33101c8 to the similar place in tcp_bpf_update_proto().

Thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [External] linux-next: manual merge of the net-next tree with the bpf tree
  2021-04-08  3:11 Stephen Rothwell
@ 2021-04-08  3:53 ` Cong Wang .
  0 siblings, 0 replies; 3+ messages in thread
From: Cong Wang . @ 2021-04-08  3:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Daniel Borkmann, Alexei Starovoitov, Networking,
	John Fastabend, Linux Kernel Mailing List,
	Linux Next Mailing List

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!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08  3:02 linux-next: manual merge of the net-next tree with the bpf tree Stephen Rothwell
2021-04-08  3:50 ` [External] " Cong Wang .
2021-04-08  3:11 Stephen Rothwell
2021-04-08  3:53 ` [External] " Cong Wang .

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git