From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Herring <robh@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: Re: linux-next: manual merge of the tty tree with the devicetree tree
Date: Thu, 17 Apr 2025 07:33:55 +0200 [thread overview]
Message-ID: <2025041745-swifter-dove-7095@gregkh> (raw)
In-Reply-To: <20250417144625.4be32ba7@canb.auug.org.au>
On Thu, Apr 17, 2025 at 02:46:25PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
>
> between commit:
>
> 672da444fccd ("dt-bindings: remove RZ/N1S bindings")
>
> from the devicetree tree and commit:
>
> 0ed228275485 ("dt-bindings: serial: snps-dw-apb-uart: Simplify DMA-less RZ/N1 rule")
>
> from the tty tree.
>
> I fixed it up (Ijust used the latter) 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:[~2025-04-17 5:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-17 4:46 linux-next: manual merge of the tty tree with the devicetree tree Stephen Rothwell
2025-04-17 5:33 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 5:48 Stephen Rothwell
2020-06-08 16:46 ` Greg KH
2014-11-28 6:17 Stephen Rothwell
2013-08-13 5:41 Stephen Rothwell
2013-08-13 6:14 ` 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=2025041745-swifter-dove-7095@gregkh \
--to=greg@kroah.com \
--cc=geert+renesas@glider.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wsa+renesas@sang-engineering.com \
/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