Linux-Next Archive on
 help / color / Atom feed
From: Marc Zyngier <>
To: Alexandre Torgue <>,
	Stephen Rothwell <>,
	Olof Johansson <>, Arnd Bergmann <>,
	ARM <>
Cc: Linux-Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Ludovic Barre <>,
	Amelie Delaunay <>
Subject: Re: linux-next: manual merge of the irqchip tree with the arm-soc tree
Date: Tue, 29 May 2018 08:47:00 +0100
Message-ID: <> (raw)
In-Reply-To: <>

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.


Jazz is not dead. It just smells funny...

  reply index

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-29  5:52 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone