Re: linux-next: manual merge of the net-next tree with the net tree

On Fri, 2019-09-13 at 02:25 +1000, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

between commit:

  5c129241e2de ("ixgbe: add support for AF_XDP need_wakeup feature")

from the net tree and commit:

  bf280c0387eb ("ixgbe: fix double clean of Tx descriptors with xdp")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your
tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any
particularly
complex conflicts.

Acked-by: Jeff Kirsher <redacted>

On how you fixed up the conflict.