On 2018年01月21日 04:17, Cong Wang wrote:
On Fri, Jan 19, 2018 at 8:02 PM, David Miller wrote:
Cong, please check my conflict resolution of drivers/net/tun.c, thank
you.
It looks good to me except I am not sure about the xdp_rxq_info_unreg()
inside tun_cleanup_tx_ring().
Looks correct to me.
On Fri, Jan 19, 2018 at 8:02 PM, David Miller wrote:
>
> Cong, please check my conflict resolution of drivers/net/tun.c, thank
> you.
It looks good to me except I am not sure about the xdp_rxq_info_unreg()
inside tun_cleanup_tx_ring().
On 01/17/2018 06:19 AM, David Miller wrote:
>
> Daniel, please double check my merge work especially wrt. your
> packet scheduler fix.
The merge resolution for the qdisc bits looks good to me, thanks!
Dave,
The resolution of the mlx5_ifc conflict was wrong and it causes a build break
in mlx5, oops :(.
I hope my resolution instructions in my pull request didn't mislead you.
I will post a patch.
-Saeed.
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 S
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.
>
> Ther
