From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Christian Eggers <ceggers@arri.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the regulator-fixes tree
Date: Mon, 17 Mar 2025 14:56:27 +0100 [thread overview]
Message-ID: <2025031712-cash-animating-4313@gregkh> (raw)
In-Reply-To: <20250317181843.59127ac9@canb.auug.org.au>
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
prev parent reply other threads:[~2025-03-17 13:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-17 7:18 linux-next: manual merge of the char-misc tree with the regulator-fixes tree Stephen Rothwell
2025-03-17 13:56 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2025031712-cash-animating-4313@gregkh \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=ceggers@arri.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox