From: David S. Miller Date: Fri, 15 Apr 2016 01:14:04 +0000 (-0400) Subject: Merge branch 'soreuseport-mixed-v4-v6-fixes' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=01c445a4bde99684effe873848b2ea65f6f8a7d1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'soreuseport-mixed-v4-v6-fixes' Craig Gallek says: ==================== Fixes for SO_REUSEPORT and mixed v4/v6 sockets Recent changes to the datastructures associated with SO_REUSEPORT broke an existing behavior when equivalent SO_REUSEPORT sockets are created using both AF_INET and AF_INET6. This patch series restores the previous behavior and includes a test to validate it. This series should be a trivial merge to stable kernels (if deemed necessary), but will have conflicts in net-next. The following patches recently replaced the use of hlist_nulls with hlists for UDP and TCP socket lists: ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU") 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under synflood") If this series is accepted, I will send an RFC for the net-next change to assist with the merge. ==================== Signed-off-by: David S. Miller --- 01c445a4bde99684effe873848b2ea65f6f8a7d1