From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Rob Herring <robh@kernel•org>,
Abdel Alkuor <abdelalkuor@geotab•com>,
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 devicetree tree
Date: Wed, 18 Oct 2023 09:56:27 +0200 [thread overview]
Message-ID: <2023101818-recant-goldfish-44b0@gregkh> (raw)
In-Reply-To: <20231018131334.5fb47992@canb.auug.org.au>
On Wed, Oct 18, 2023 at 01:13:34PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
>
> between commit:
>
> 47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properties")
>
> from the devicetree tree and commit:
>
> 6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750")
>
> from the usb tree.
>
> I fixed it up (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 good, thanks!
greg k-h
next prev parent reply other threads:[~2023-10-18 7:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 2:13 linux-next: manual merge of the usb tree with the devicetree tree Stephen Rothwell
2023-10-18 7:56 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-28 6:22 Stephen Rothwell
2020-05-28 10:49 ` Greg KH
2020-05-28 14:14 ` Rob Herring
2020-05-29 8:26 ` Greg KH
2020-05-29 8:28 ` Greg KH
2020-05-29 8:44 ` Felipe Balbi
2020-05-29 14:04 ` Rob Herring
2020-05-29 14:24 ` Felipe Balbi
2013-06-25 6:53 Stephen Rothwell
2013-06-25 15:18 ` 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=2023101818-recant-goldfish-44b0@gregkh \
--to=greg@kroah$(echo .)com \
--cc=abdelalkuor@geotab$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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