netdev - Re: [PATCH net-next] soreuseport: Resolve merge conflict for v4/v6 ordering fix

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 25 Apr 2016 13:28:22 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	kraigatgoog@...il.com
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH net-next] soreuseport: Resolve merge conflict for v4/v6
 ordering fix

From: Craig Gallek <kraigatgoog@...il.com>
Date: Mon, 25 Apr 2016 10:42:12 -0400

> From: Craig Gallek <kraig@...gle.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@...gle.com>

Applied, thanks for taking care of this Craig.