From: Olof Johansson <olof@lixom.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Arnd Bergmann <arnd@arndb.de>, Xiaowei Bao <xiaowei.bao@nxp.com>,
Shawn Guo <shawnguo@kernel.org>,
Hou Zhiqiang <Zhiqiang.Hou@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Fabio Estevam <festevam@gmail.com>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree
Date: Thu, 7 Nov 2019 10:27:20 -0800 [thread overview]
Message-ID: <CAOesGMjVUCd9bN=pggS-ECjMR42b0SqXKewsp+NYFSVqRgSWrg@mail.gmail.com> (raw)
In-Reply-To: <20191107094555.6296b943@canb.auug.org.au>
On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
>
> between commit:
>
> 68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")
>
> from the arm-soc tree and commit:
>
> 8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")
Bjorn, we ask that driver subsystem maintainers don't pick up DT
changes since it causes conflicts like these.
Is it easy for you to drop this patch, or are we stuck with it?
Ideally it should never have been sent to you in the first place. :(
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-07 18:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 22:45 linux-next: manual merge of the pci tree with the arm-soc tree Stephen Rothwell
2019-11-07 18:27 ` Olof Johansson [this message]
2019-11-07 21:18 ` Bjorn Helgaas
2019-11-08 11:07 ` Lorenzo Pieralisi
2019-11-08 20:18 ` Bjorn Helgaas
2019-11-08 22:29 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 22:57 Stephen Rothwell
2022-12-13 16:21 ` Bjorn Helgaas
2022-12-13 16:48 ` Thierry Reding
2022-12-13 19:03 ` Serge Semin
2022-12-13 19:53 ` Bjorn Helgaas
2022-12-13 20:07 ` Bjorn Helgaas
2022-12-13 23:36 ` Serge Semin
2022-12-14 14:37 ` Thierry Reding
2022-12-14 22:07 ` Serge Semin
2022-12-15 12:06 ` Thierry Reding
2022-12-15 23:56 ` Serge Semin
2018-04-03 2:00 Stephen Rothwell
2015-08-17 1:08 Stephen Rothwell
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='CAOesGMjVUCd9bN=pggS-ECjMR42b0SqXKewsp+NYFSVqRgSWrg@mail.gmail.com' \
--to=olof@lixom.net \
--cc=Zhiqiang.Hou@nxp.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=festevam@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=shawnguo@kernel.org \
--cc=xiaowei.bao@nxp.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;
as well as URLs for NNTP newsgroup(s).