linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2025031712-cash-animating-4313@gregkh>
Date: Mon, 17 Mar 2025 14:56:27 +0100
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Arnd Bergmann <arnd@...db.de>, Mark Brown <broonie@...nel.org>,
	Liam Girdwood <lgirdwood@...il.com>,
	Christian Eggers <ceggers@...i.de>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 regulator-fixes tree

On Mon, Mar 17, 2025 at 06:18:43PM +1100, Stephen Rothwell wrote:
> 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.

Resolution sounds good to me, thanks!

greg k-h