linux-kernel - Re: linux-next: manual merge of the hyperv tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20211220175356.ozllm6jqid5zv7oe@liuwe-devbox-debian-v2>
Date:   Mon, 20 Dec 2021 17:53:56 +0000
From:   Wei Liu <wei.liu@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Wei Liu <wei.liu@...nel.org>, David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Christophe JAILLET <christophe.jaillet@...adoo.fr>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tianyu Lan <Tianyu.Lan@...rosoft.com>
Subject: Re: linux-next: manual merge of the hyperv tree with the net-next
 tree

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.