From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Rob Herring <robh@kernel.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
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: linux-next: manual merge of the tty tree with the devicetree tree
Date: Thu, 17 Apr 2025 14:46:25 +1000 [thread overview]
Message-ID: <20250417144625.4be32ba7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-04-17 4:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-17 4:46 Stephen Rothwell [this message]
2025-04-17 5:33 ` linux-next: manual merge of the tty tree with the devicetree tree Greg KH
-- 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=20250417144625.4be32ba7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert+renesas@glider.be \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--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