From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753565AbbJIUxa (ORCPT <rfc822;w@1wt.eu>);
	Fri, 9 Oct 2015 16:53:30 -0400
Received: from www.linutronix.de ([62.245.132.108]:39200 "EHLO
	Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750702AbbJIUx2 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 9 Oct 2015 16:53:28 -0400
Date: Fri, 9 Oct 2015 22:52:48 +0200 (CEST)
From: Thomas Gleixner <tglx@linutronix.de>
To: Marc Zyngier <marc.zyngier@arm.com>
cc: Jason Cooper <jason@lakedaemon.net>,
        Catalin Marinas <catalin.marinas@arm.com>, Duc Dang <dhdang@apm.com>,
        Jean-Philippe Brucker <jean-philippe.brucker@arm.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PULL] GIC changes for Linux 4.4
In-Reply-To: <1444404432-1992-1-git-send-email-marc.zyngier@arm.com>
Message-ID: <alpine.DEB.2.11.1510092251420.6097@nanos>
References: <1444404432-1992-1-git-send-email-marc.zyngier@arm.com>
User-Agent: Alpine 2.11 (DEB 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Linutronix-Spam-Score: -1.0
X-Linutronix-Spam-Level: -
X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required,  ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 9 Oct 2015, Marc Zyngier wrote:
> The following changes since commit 049e6dde7e57f0054fdc49102e7ef4830c698b46:
> 
>   Linux 4.3-rc4 (2015-10-04 16:57:17 +0100)

That's not the best base. tip irq/core already has gic modifications
which conflict. Can you please rebase to tip irq/core?

Thanks,

	tglx