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] [day] [month] [year] [list]

Message-ID: <2300961.iZASKD2KPV@phil>
Date: Wed, 12 Mar 2025 08:03:14 +0100
From: Heiko Stuebner <heiko@...ech.de>
To: Detlev Casanova <detlev.casanova@...labora.com>,
 Stephen Rothwell <sfr@...b.auug.org.au>
Cc: James Bottomley <James.Bottomley@...senpartnership.com>,
 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

Am Dienstag, 11. März 2025, 22:51:01 MEZ schrieb Stephen Rothwell:
> 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.

I mentioned it now in my devicetree pull-request for the soc-side
see https://lore.kernel.org/soc/3339830.aeNJFYEL58@phil/

Heiko