linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Borkmann <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@kernel.org>,
	Networking <netdev@vger.kernel.org>,
	David Miller <davem@davemloft.net>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Kuniyuki Iwashima <kuniyu@amazon.co.jp>,
	Jakub Sitnicki <jakub@cloudflare.com>
Subject: linux-next: manual merge of the bpf-next tree with the net tree
Date: Wed, 22 Jul 2020 13:21:43 +1000	[thread overview]
Message-ID: <20200722132143.700a5ccc@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the bpf-next tree got conflicts in:

  net/ipv4/udp.c
  net/ipv6/udp.c

between commit:

  efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.")

from the net tree and commits:

  7629c73a1466 ("udp: Extract helper for selecting socket from reuseport group")
  2a08748cd384 ("udp6: Extract helper for selecting socket from reuseport group")

from the bpf-next tree.

I fixed it up (I wasn't sure how to proceed, so I used the latter
version) 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.

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2020-07-22  3:21 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22  3:21 Stephen Rothwell [this message]
2020-07-22 12:17 ` Jakub Sitnicki
2020-07-22 14:42   ` Kuniyuki Iwashima
2020-07-22 15:02     ` Jakub Sitnicki
2020-07-22 15:05       ` Willem de Bruijn
2020-07-22 15:25         ` Jakub Sitnicki
2020-07-22 15:49           ` Willem de Bruijn
2020-07-22 17:14             ` Alexei Starovoitov
2020-07-23  2:11 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-12-19 23:23 Stephen Rothwell
2019-10-13 23:32 Stephen Rothwell
2019-10-15 23:30 ` Stephen Rothwell
2019-03-26 22:14 Stephen Rothwell
2019-03-27  1:56 ` Alexei Starovoitov
2019-03-27  9:26   ` Luca Boccassi
2019-03-27 15:15     ` Alexei Starovoitov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200722132143.700a5ccc@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=jakub@cloudflare.com \
    --cc=kuniyu@amazon.co.jp \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --subject='Re: linux-next: manual merge of the bpf-next tree with the net tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox