From: David Miller <davem@davemloft.net>
To: kraigatgoog@gmail.com
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH net-next] soreuseport: Resolve merge conflict for v4/v6 ordering fix
Date: Mon, 25 Apr 2016 13:28:22 -0400 (EDT) [thread overview]
Message-ID: <20160425.132822.1730357626652084511.davem@davemloft.net> (raw)
In-Reply-To: <1461595332-16994-1-git-send-email-kraigatgoog@gmail.com>
From: Craig Gallek <kraigatgoog@gmail.com>
Date: Mon, 25 Apr 2016 10:42:12 -0400
> From: Craig Gallek <kraig@google.com>
>
> d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets")
> was merged as a bug fix to the net tree. Two conflicting changes
> were committed to net-next before the above fix was merged back to
> net-next:
> ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
> 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under synflood")
>
> These changes switched the datastructure used for TCP and UDP sockets
> from hlist_nulls to hlist. This patch applies the necessary parts
> of the net tree fix to net-next which were not automatic as part of the
> merge.
>
> Fixes: 1602f49b58ab ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> Signed-off-by: Craig Gallek <kraig@google.com>
Applied, thanks for taking care of this Craig.
next prev parent reply other threads:[~2016-04-25 17:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-25 14:42 [PATCH net-next] soreuseport: Resolve merge conflict for v4/v6 ordering fix Craig Gallek
2016-04-25 17:28 ` David Miller [this message]
2016-04-25 17:33 ` Eric Dumazet
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=20160425.132822.1730357626652084511.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=kraigatgoog@gmail.com \
--cc=netdev@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).