On Fri, Jan 19, 2018 at 8:02 PM, David Miller <da...@davemloft.net> 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().
