Date:   Mon, 20 Dec 2021 17:53:56 +0000
From:   Wei Liu <wei.liu@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Wei Liu <wei.liu@kernel.org>, David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        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: Re: linux-next: manual merge of the hyperv tree with the net-next
 tree
Message-ID: <20211220175356.ozllm6jqid5zv7oe@liuwe-devbox-debian-v2>
References: <20211220185139.034d8e15@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211220185139.034d8e15@canb.auug.org.au>
Precedence: bulk

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.