> -----Original Message-----
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Sent: Thursday, March 19, 2020 2:11 AM
> To: David Miller <davem@xxxxxxxxxxxxx>; Networking
> <netdev@xxxxxxxxxxxxxxx>
> Cc: Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>; Linux Kernel Mailing
> List <linux-kernel@xxxxxxxxxxxxxxx>; Kiyanovski, Arthur
> <akiyano@xxxxxxxxxx>; Dagan, Noam <ndagan@xxxxxxxxxx>; Leon
> Romanovsky <leonro@xxxxxxxxxxxx>
> Subject: [EXTERNAL] 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:
>
> dfdde1345bc1 ("net: ena: fix continuous keep-alive resets")
>
> from the net tree and commit:
>
> 1a63443afd70 ("net/amazon: Ensure that driver version is aligned to the linux
> kernel")
>
> 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 4647d7656761,555c7273d712..000000000000
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> @@@ -3486,10 -3473,7 +3483,8 @@@ static int ena_restore_device(struct en
> netif_carrier_on(adapter->netdev);
>
> mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
> + adapter->last_keep_alive_jiffies = jiffies;
> - dev_err(&pdev->dev,
> - "Device reset completed successfully, Driver info: %s\n",
> - version);
> + dev_err(&pdev->dev, "Device reset completed successfully\n");
>
> return rc;
> err_disable_msix:
Acked-by: Arthur Kiyanovski <akiyano@xxxxxxxxxx>
Thanks!
