linux-kernel - linux-next: manual merge of the sysctl tree with the hyperv 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-next>] [day] [month] [year] [list]

Message-Id: <20230424154742.131094-1-broonie@kernel.org>
Date:   Mon, 24 Apr 2023 16:47:42 +0100
From:   broonie@...nel.org
To:     Luis Chamberlain <mcgrof@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Long Li <longli@...rosoft.com>, Wei Liu <wei.liu@...nel.org>
Subject: linux-next: manual merge of the sysctl tree with the hyperv tree

Hi all,

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

  drivers/hv/vmbus_drv.c

between commit:

  9c318a1d9b500 ("Drivers: hv: move panic report code from vmbus to hv early init code")

from the hyperv tree and commit:

  525f23fe58b59 ("hv: simplify sysctl registration")

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

diff --cc drivers/hv/vmbus_drv.c
index 1c65a6dfb9fae,229353f1e9c29..0000000000000
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c