public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
To: Marc Zyngier <marc.zyngier@arm.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Jason Cooper <jason@lakedaemon.net>,
	Noam Camus <noamc@ezchip.com>,
	<linux-snps-arc@lists.infradead.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] irqchip: nps: add 64BIT dependency
Date: Fri, 13 May 2016 16:09:21 +0530	[thread overview]
Message-ID: <5735AED9.2000405@synopsys.com> (raw)
In-Reply-To: <5735ABAB.4060308@arm.com>

On Friday 13 May 2016 03:55 PM, Marc Zyngier wrote:
> On 13/05/16 10:51, Arnd Bergmann wrote:
>> On Friday 13 May 2016 14:05:41 Vineet Gupta wrote:
>>> On Friday 13 May 2016 01:54 PM, Marc Zyngier wrote:
>>>> On 12/05/16 22:03, Arnd Bergmann wrote:
>>> ...
>>>>>  
>>>>>  config EZNPS_GIC
>>>>>      bool "NPS400 Global Interrupt Manager (GIM)"
>>>>> +    depends on ARC || (COMPILE_TEST && !64BIT)
>>>>>      select IRQ_DOMAIN
>>>>>      help
>>>>>        Support the EZchip NPS400 global interrupt controller
>>>>>
>>>>
>>>> Acked-by: Marc Zyngier <narc.zyngier@arm.com>
>>>>
>>>> As I've already started collecting fixes that are aimed at -rc1 (mostly
>>>> to avoid dependencies), I can queue that as well.
>>>
>>> There is a slight logistics issue here - as agreed the driver will go in 4.7-rc1
>>> via ARC tree. So either I pick the fix for rc1 or you apply it post rc1 - or
>>> towards the end of rc1 ?
>>>
>>
>> I'd say the best option is to have you pick up the fix for the ARC tree,
>> but either way works.
> 
> That'd work for me too (I've acked it anyway). Just let me know what you
> decide to do.

I'd prefer Marc takes it post rc1. The reason being chances of merge conflicts
between ARC and tip trees increase with ARC tree changing drivers/irqchip/*. We've
seen two of those already which Stephen fixed up in linux-next. Although
admittedly the conflicts are trivial and given the location of this diff hunk it
might not happen at all....

-Vineet

  reply	other threads:[~2016-05-13 10:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-12 21:03 [PATCH] irqchip: nps: add 64BIT dependency Arnd Bergmann
2016-05-13  8:24 ` Marc Zyngier
2016-05-13  8:35   ` Vineet Gupta
2016-05-13  8:39     ` Marc Zyngier
2016-05-13  9:51     ` Arnd Bergmann
2016-05-13 10:25       ` Marc Zyngier
2016-05-13 10:39         ` Vineet Gupta [this message]
2016-05-17 19:39           ` Thomas Gleixner
2016-05-20  7:34 ` Geert Uytterhoeven
2016-05-20  8:22   ` Vineet Gupta
2016-05-20  8:25     ` Geert Uytterhoeven

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=5735AED9.2000405@synopsys.com \
    --to=vineet.gupta1@synopsys.com \
    --cc=arnd@arndb.de \
    --cc=jason@lakedaemon.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-snps-arc@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=noamc@ezchip.com \
    --cc=tglx@linutronix.de \
    /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