Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
IronPort-SDR: ruMMCJZ7fApUQIVF9DZVeM3dvRT/AWslGTOzt0cfEeIfviEUYbCa7vdtNwrGQfSu56xWm9MDTl
 pRn3VzwX/y5g==
Subject: RE: linux-next: manual merge of the net-next tree with the net tree
Thread-Topic: linux-next: manual merge of the net-next tree with the net tree
From:   "Kiyanovski, Arthur" <akiyano@amazon.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
CC:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
        "Dagan, Noam" <ndagan@amazon.com>,
        Leon Romanovsky <leonro@mellanox.com>,
        "Jubran, Samih" <sameehj@amazon.com>,
        "Tzalik, Guy" <gtzalik@amazon.com>
Thread-Index: AQHV/YLplQ6FCTxckkWvIAUktW3nY6hPQn/Q
Date:   Thu, 19 Mar 2020 03:36:07 +0000
Deferred-Delivery: Thu, 19 Mar 2020 03:35:53 +0000
Message-ID: <cd2de6ba830f4f5ea897f4b7969248ea@EX13D22EUA004.ant.amazon.com>
References: <20200319111053.597bd4d1@canb.auug.org.au>
In-Reply-To: <20200319111053.597bd4d1@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Sent: Thursday, March 19, 2020 2:11 AM
> To: David Miller <davem@davemloft.net>; Networking
> <netdev@vger.kernel.org>
> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel Ma=
iling
> List <linux-kernel@vger.kernel.org>; Kiyanovski, Arthur
> <akiyano@amazon.com>; Dagan, Noam <ndagan@amazon.com>; Leon
> Romanovsky <leonro@mellanox.com>
> Subject: [EXTERNAL] linux-next: manual merge of the net-next tree with th=
e net
> tree
>=20
> Hi all,
>=20
> Today's linux-next merge of the net-next tree got a conflict in:
>=20
>   drivers/net/ethernet/amazon/ena/ena_netdev.c
>=20
> between commit:
>=20
>   dfdde1345bc1 ("net: ena: fix continuous keep-alive resets")
>=20
> from the net tree and commit:
>=20
>   1a63443afd70 ("net/amazon: Ensure that driver version is aligned to the=
 linux
> kernel")
>=20
> from the net-next tree.
>=20
> 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 m=
entioned
> 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.
>=20
> --
> Cheers,
> Stephen Rothwell
>=20
> 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);
>=20
>   	mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
>  +	adapter->last_keep_alive_jiffies =3D jiffies;
> - 	dev_err(&pdev->dev,
> - 		"Device reset completed successfully, Driver info: %s\n",
> - 		version);
> + 	dev_err(&pdev->dev, "Device reset completed successfully\n");
>=20
>   	return rc;
>   err_disable_msix:

Acked-by: Arthur Kiyanovski <akiyano@amazon.com>

Thanks!