From: Heiko Stuebner <heiko@sntech.de>
To: Detlev Casanova <detlev.casanova@collabora.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: Re: linux-next: manual merge of the scsi tree with the rockchip tree
Date: Wed, 12 Mar 2025 08:03:14 +0100 [thread overview]
Message-ID: <2300961.iZASKD2KPV@phil> (raw)
In-Reply-To: <20250312085101.58cdd1e5@canb.auug.org.au>
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@collabora.com> wrote:
> >
> > Unfortunately, this fix is incorrect as nodes must be in address order, so
> > ufshc: ufshc@2a2d0000 must be above sfc1: spi@2a300000.
>
> 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
prev parent reply other threads:[~2025-03-12 7:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 7:35 linux-next: manual merge of the scsi tree with the rockchip tree Stephen Rothwell
2025-03-11 16:24 ` Detlev Casanova
2025-03-11 21:51 ` Stephen Rothwell
2025-03-12 7:03 ` Heiko Stuebner [this message]
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=2300961.iZASKD2KPV@phil \
--to=heiko@sntech.de \
--cc=James.Bottomley@hansenpartnership.com \
--cc=detlev.casanova@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=shawn.lin@rock-chips.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.