linux-kernel - Re: linux-next: manual merge of the tty tree with the devicetree tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2025041745-swifter-dove-7095@gregkh>
Date: Thu, 17 Apr 2025 07:33:55 +0200
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Rob Herring <robh@...nel.org>,
	Geert Uytterhoeven <geert+renesas@...der.be>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Wolfram Sang <wsa+renesas@...g-engineering.com>
Subject: Re: linux-next: manual merge of the tty tree with the devicetree tree

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