From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752741AbcEMKjn (ORCPT ); Fri, 13 May 2016 06:39:43 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:45149 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751849AbcEMKjm (ORCPT ); Fri, 13 May 2016 06:39:42 -0400 Subject: Re: [PATCH] irqchip: nps: add 64BIT dependency To: Marc Zyngier , Arnd Bergmann References: <1463087038-2522527-1-git-send-email-arnd@arndb.de> <57358F52.706@arm.com> <573591DD.6040403@synopsys.com> <2976650.9K4CeZnHUc@wuerfel> <5735ABAB.4060308@arm.com> CC: Jason Cooper , Noam Camus , , Thomas Gleixner , Newsgroups: gmane.linux.kernel,gmane.linux.kernel.arc From: Vineet Gupta Message-ID: <5735AED9.2000405@synopsys.com> Date: Fri, 13 May 2016 16:09:21 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <5735ABAB.4060308@arm.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.12.197.158] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >>>> >>>> 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vineet.Gupta1@synopsys.com (Vineet Gupta) Date: Fri, 13 May 2016 16:09:21 +0530 Subject: [PATCH] irqchip: nps: add 64BIT dependency In-Reply-To: <5735ABAB.4060308@arm.com> References: <1463087038-2522527-1-git-send-email-arnd@arndb.de> <57358F52.706@arm.com> <573591DD.6040403@synopsys.com> <2976650.9K4CeZnHUc@wuerfel> <5735ABAB.4060308@arm.com> List-ID: Message-ID: <5735AED9.2000405@synopsys.com> To: linux-snps-arc@lists.infradead.org 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 >>>> >>>> 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