> -----Original Message-----
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Sent: Monday, December 16, 2019 1:05 AM
> To: David Miller <davem@xxxxxxxxxxxxx>; Networking
> <netdev@xxxxxxxxxxxxxxx>
> Cc: Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>; Linux Kernel
> Mailing List <linux-kernel@xxxxxxxxxxxxxxx>; Belgazal, Netanel
> <netanel@xxxxxxxxxx>; Jubran, Samih <sameehj@xxxxxxxxxx>
> Subject: linux-next: manual merge of the net-next tree with the net tree
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/amazon/ena/ena_netdev.c
>
> between commit:
>
> 24dee0c7478d ("net: ena: fix napi handler misbehavior when the napi
> budget is zero")
>
> from the net tree and commit:
>
> 548c4940b9f1 ("net: ena: Implement XDP_TX action")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
> index 948583fdcc28,26954fde4766..000000000000
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> @@@ -1237,9 -1861,8 +1861,8 @@@ static int ena_io_poll(struct napi_stru
> {
> struct ena_napi *ena_napi = container_of(napi, struct ena_napi,
> napi);
> struct ena_ring *tx_ring, *rx_ring;
> -
> - u32 tx_work_done;
> - u32 rx_work_done;
> + int tx_work_done;
> + int rx_work_done = 0;
> int tx_budget;
> int napi_comp_call = 0;
> int ret;
Thanks, looks good to me. Sorry for the inconvenience.
