linux-kernel - Re: linux-next: manual merge of the scsi tree with the rockchip 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20250312085101.58cdd1e5@canb.auug.org.au>
Date: Wed, 12 Mar 2025 08:51:01 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Detlev Casanova <detlev.casanova@...labora.com>
Cc: James Bottomley <James.Bottomley@...senpartnership.com>, Heiko Stuebner
 <heiko@...ech.de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, "Martin K. Petersen"
 <martin.petersen@...cle.com>, Shawn Lin <shawn.lin@...k-chips.com>
Subject: Re: linux-next: manual merge of the scsi tree with the rockchip
 tree

Hi Detlev,

On Tue, 11 Mar 2025 12:24:25 -0400 Detlev Casanova <detlev.casanova@...labora.com> wrote:
>
> Unfortunately, this fix is incorrect as nodes must be in address order, so 
> ufshc: ufshc@...d0000 must be above sfc1: spi@...00000.

OK, I have switched it around in my resolution.

> As we are close the the merge window, I won't mind if the patches have to be 
> postponed to the next cycle, but some device trees won't build anymore.
> 
> This can also be left as is with a new patch to fix the order (to be backported 
> if needed)

This merge resolution will be redone by Linus when the trees are merged
during the merge window.  Someone just needs to mention it to him.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped