From: Marc Zyngier <marc.zyngier@arm.com>
To: Alexandre Torgue <alexandre.torgue@st.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ludovic Barre <ludovic.barre@st.com>,
Amelie Delaunay <amelie.delaunay@st.com>
Subject: Re: linux-next: manual merge of the irqchip tree with the arm-soc tree
Date: Tue, 29 May 2018 08:47:00 +0100 [thread overview]
Message-ID: <c306fbd9-21d9-5345-e820-52bc23d1b7c7@arm.com> (raw)
In-Reply-To: <1bedc0b7-21f9-1e15-a11c-3de06e81b5ba@st.com>
On 29/05/18 08:41, Alexandre Torgue wrote:
> Hi Stephen
>
> On 05/29/2018 07:52 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the irqchip tree got a conflict in:
>>
>> arch/arm/boot/dts/stm32mp157c.dtsi
>>
>> between commit:
>>
>> 3c00436fdb20 ("ARM: dts: stm32: add USBPHYC support to stm32mp157c")
>>
>> from the arm-soc tree and commit:
>>
>> 5f0e9d2557d7 ("ARM: dts: stm32: Add exti support for stm32mp157c")
>>
>> from the irqchip tree.
>>
>> I fixed it up (see below) 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.
>>
>
> Thanks for the fix (I will reorder nodes in a future patch). My opinion
> is that all STM32 DT patches should come through my STM32 tree. It is my
> role to fix this kind of conflicts. I thought it was a common rule
> (driver patches go to sub-system maintainer tree and DT to the Machine
> maintainer). For incoming next-series which contain DT+driver patches I
> will indicate clearly that I take DT patch. I'm right ?
Happy to oblige. Can you make sure you sync up with Ludovic and define
what you want to do?
In the meantime, I'm dropping the series altogether.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2018-05-29 7:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 5:52 linux-next: manual merge of the irqchip tree with the arm-soc tree Stephen Rothwell
2018-05-29 7:41 ` Alexandre Torgue
2018-05-29 7:47 ` Marc Zyngier [this message]
2018-05-29 8:16 ` Alexandre Torgue
2018-05-29 8:39 ` Marc Zyngier
2018-05-29 8:55 ` Alexandre Torgue
2018-05-29 12:20 ` Ludovic BARRE
2018-05-30 5:10 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2021-04-23 3:22 Stephen Rothwell
2021-04-09 5:52 Stephen Rothwell
2014-07-29 5:53 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=c306fbd9-21d9-5345-e820-52bc23d1b7c7@arm.com \
--to=marc.zyngier@arm.com \
--cc=alexandre.torgue@st.com \
--cc=amelie.delaunay@st.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ludovic.barre@st.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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).