Date:   Mon, 20 Dec 2021 18:51:39 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Wei Liu <wei.liu@kernel.org>, David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tianyu Lan <Tianyu.Lan@microsoft.com>
Subject: linux-next: manual merge of the hyperv tree with the net-next tree
Message-ID: <20211220185139.034d8e15@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/i2X==Lei54qKdGx+3=x1b/C";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/i2X==Lei54qKdGx+3=x1b/C
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/net/hyperv/netvsc.c

between commit:

  e9268a943998 ("hv_netvsc: Use bitmap_zalloc() when applicable")

from the net-next tree and commit:

  63cd06c67a2f ("net: netvsc: Add Isolation VM support for netvsc driver")

from the hyperv 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/net/hyperv/netvsc.c
index 5086cd07d1ed,ea2d867121d5..000000000000
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@@ -153,9 -153,22 +153,22 @@@ static void free_netvsc_device(struct r
  	int i;
 =20
  	kfree(nvdev->extension);
- 	vfree(nvdev->recv_buf);
- 	vfree(nvdev->send_buf);
+=20
+ 	if (nvdev->recv_original_buf) {
+ 		hv_unmap_memory(nvdev->recv_buf);
+ 		vfree(nvdev->recv_original_buf);
+ 	} else {
+ 		vfree(nvdev->recv_buf);
+ 	}
+=20
+ 	if (nvdev->send_original_buf) {
+ 		hv_unmap_memory(nvdev->send_buf);
+ 		vfree(nvdev->send_original_buf);
+ 	} else {
+ 		vfree(nvdev->send_buf);
+ 	}
+=20
 -	kfree(nvdev->send_section_map);
 +	bitmap_free(nvdev->send_section_map);
 =20
  	for (i =3D 0; i < VRSS_CHANNEL_MAX; i++) {
  		xdp_rxq_info_unreg(&nvdev->chan_table[i].xdp_rxq);
@@@ -336,7 -349,9 +349,8 @@@ static int netvsc_init_buf(struct hv_de
  	struct net_device *ndev =3D hv_get_drvdata(device);
  	struct nvsp_message *init_packet;
  	unsigned int buf_size;
 -	size_t map_words;
  	int i, ret =3D 0;
+ 	void *vaddr;
 =20
  	/* Get receive buffer area. */
  	buf_size =3D device_info->recv_sections * device_info->recv_section_size;

--Sig_/i2X==Lei54qKdGx+3=x1b/C
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmHANgsACgkQAVBC80lX
0GwP+wf8CcfNfxiR91qe3oV15Vjmxyod7GirwV6/ShesS094jNppYZmCyF2GJJYU
qjiSw76vEvnLvM9up+zT30JRSrROD/QzKpApmtfK64v1qV+5DtuUK0PFgp9+jcrx
GbSl2/XuDRJ2BT7EXfGMtV+6gOdMr/4ca40k/s4TZlwz4CSIJDJVR+GtyGyY712l
1zIiI8a6ahtP1+shykgDcxpT3MOwGaMm09YOLv89EWq3Td7Ah8JcGYs5STF718aO
vXgTMSm84MOFhatxNfKzb+FWttRvxK3/59OdVXhFXu8IfDNqJMFAy+9sQSjam/v7
0LYyVh1YHIkp1mIuQDYtjME7ViyMhA==
=oj++
-----END PGP SIGNATURE-----

--Sig_/i2X==Lei54qKdGx+3=x1b/C--