linux-kernel - linux-next: manual merge of the random tree with the pm 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: <20240429161743.21019d15@canb.auug.org.au>
Date: Mon, 29 Apr 2024 16:17:43 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Theodore Ts'o <tytso@....edu>, "Jason A. Donenfeld" <Jason@...c4.com>,
 "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, "Rafael J. Wysocki"
 <rafael.j.wysocki@...el.com>, Sudan Landge <sudanl@...zon.com>
Subject: linux-next: manual merge of the random tree with the pm tree

Hi all,

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

  drivers/virt/vmgenid.c

between commit:

  00e8b52bf9f9 ("virt: vmgenid: drop owner assignment")

from the pm tree and commits:

  e07606713a90 ("virt: vmgenid: change implementation to use a platform driver")
  7b1bcd6b50a6 ("virt: vmgenid: add support for devicetree bindings")

from the random tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped