On Mon, Dec 20, 2021 at 06:51:39PM +1100, Stephen Rothwell wrote:
> 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.
>
The fix looks correct to me. Thanks.
Wei.
