From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Danila Tikhonov <danila@jiaxyga.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
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 usb tree with the regulator tree
Date: Tue, 20 Feb 2024 09:18:27 +0100 [thread overview]
Message-ID: <2024022016-unmanned-devouring-603c@gregkh> (raw)
In-Reply-To: <20240220143142.540fe132@canb.auug.org.au>
On Tue, Feb 20, 2024 at 02:31:42PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
>
> between commit:
>
> ec29a4d9b7c7 ("dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible")
>
> from the regulator tree and commit:
>
> ef6035d2f1f4 ("dt-bindings: regulator: qcom,usb-vbus-regulator: add support for PMI632")
>
> from the usb tree.
>
> I fixed it up (I have no idea if this is correct - 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.
Looks correct, thanks!
greg k-h
next prev parent reply other threads:[~2024-02-20 8:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 3:31 linux-next: manual merge of the usb tree with the regulator tree Stephen Rothwell
2024-02-20 8:18 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-22 4:38 Stephen Rothwell
2024-02-22 7:42 ` Greg KH
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=2024022016-unmanned-devouring-603c@gregkh \
--to=greg@kroah.com \
--cc=broonie@kernel.org \
--cc=danila@jiaxyga.com \
--cc=dmitry.baryshkov@linaro.org \
--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