Thanks David, There was one other change that conflicts (functionally) with this merge as well: 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under synflood") It did a similar hlist_nulls -> hlist transform for the TCP stack. I'll send a formal patch to address this as well.
Craig On Sat, Apr 23, 2016 at 9:39 PM, Eric Dumazet <eric.duma...@gmail.com> wrote: > On Sat, 2016-04-23 at 20:12 -0400, David Miller wrote: >> Eric, please double check my merge work for net/ipv4/udp.c >> >> In net we fixed a soreuseport bug that added a hlist_nulls_add_tail_rcu() >> call to net/ipv4/udp.c >> >> And in net-next you converted UDP sockets away from nulls lists. >> >> Therefore I had to add a hlist_add_tail_rcu() implementation to >> linux/rculist.h and use it in net/ipv4/udp.c >> >> Please make sure this is fine and will work safely. >> >> Thanks! > > Looks fine to me, thanks David > > Craig, please have a look ? > > ( commit 1602f49b58abcb0d34a5f0a29d68e7c1769547aa in net-next) > >