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

Message-ID: <20250317181843.59127ac9@canb.auug.org.au>
Date: Mon, 17 Mar 2025 18:18:43 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>, Mark Brown
 <broonie@...nel.org>, Liam Girdwood <lgirdwood@...il.com>
Cc: Christian Eggers <ceggers@...i.de>, Greg Kroah-Hartman
 <gregkh@...uxfoundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the char-misc tree with the
 regulator-fixes tree

Hi all,

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

  drivers/regulator/dummy.c

between commit:

  8619909b38ee ("regulator: dummy: force synchronous probing")

from the regulator-fixes tree and commit:

  dcd2a9a5550e ("regulator: dummy: convert to use the faux device interface")

from the char-misc tree.

I fixed it up (I just used the latter - since that seems to always use
synchronous probing) 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