Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753694AbbHKWsl (ORCPT ); Tue, 11 Aug 2015 18:48:41 -0400 Received: from foss.arm.com ([217.140.101.70]:55391 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134AbbHKWsj (ORCPT ); Tue, 11 Aug 2015 18:48:39 -0400 Date: Tue, 11 Aug 2015 23:48:01 +0100 From: Marc Zyngier To: Timur Tabi Cc: "hanjun.guo@linaro.org" , Jason Cooper , Will Deacon , Catalin Marinas , "Rafael J. Wysocki" , Thomas Gleixner , Jiang Liu , Bjorn Helgaas , Lorenzo Pieralisi , "suravee.suthikulpanit@amd.com" , Tomasz Nowicki , "grant.likely@linaro.org" , Mark Brown , Wei Huang , "linux-arm-kernel@lists.infradead.org" , "linux-acpi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linaro-acpi@lists.linaro.org" Subject: Re: [PATCH v4 00/10] ACPI GIC Self-probing, GICv2m and GICv3 support Message-ID: <20150811234801.51108784@arm.com> In-Reply-To: <55CA78DE.1000306@codeaurora.org> References: <1438164539-29256-1-git-send-email-hanjun.guo@linaro.org> <55CA70D5.6040300@codeaurora.org> <20150811232523.60d192d2@arm.com> <55CA78DE.1000306@codeaurora.org> Organization: ARM Ltd X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; arm-unknown-linux-gnueabihf) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1279 Lines: 36 On Tue, 11 Aug 2015 23:36:14 +0100 Timur Tabi wrote: > On 08/11/2015 05:25 PM, Marc Zyngier wrote: > > My branch, as far as I can tell by looking at my own git tree, is based > > on v4.2-rc2. As for "the LEG kernel", I have no idea what that is. I > > only work on this thing called "the Linux kernel". You may have heard > > of it!;-) > > Then what is this: > > git://git.linaro.org/leg/acpi/acpi.git > ^^^ > > This is your tree, isn't it? My tree would have "maz" in it, and would rather be hosted on kernel.org. > Hanjun said, "Patches are on top of Marc's > branch irq/gsi-irq-domain-v2, and available at: > git://git.linaro.org/leg/acpi/acpi.git gsi-irqdomain". I don't see any contradiction here. Hanjun picked the patches from my own branch in my own tree, put his own patches on top, and pushed that out on an branch called gsi-irqdomain that is definitely based on 4.2-rc2. I have no idea where your 3.9-rc7 comes from. M. -- Jazz is not dead. It just smells funny. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/