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 S1753426AbbCPIr6 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 16 Mar 2015 04:47:58 -0400
Received: from foss.arm.com ([217.140.101.70]:55801 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752998AbbCPIr4 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 16 Mar 2015 04:47:56 -0400
Message-ID: <550698B8.80108@arm.com>
Date: Mon, 16 Mar 2015 08:47:52 +0000
From: Marc Zyngier <marc.zyngier@arm.com>
Organization: ARM Ltd
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Jason Cooper <jason@lakedaemon.net>,
        Stephen Warren <swarren@nvidia.com>, Colin Cross <ccross@android.com>,
        Olof Johansson <olof@lixom.net>, Thierry Reding <treding@nvidia.com>
CC: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Bob Mottram <bob.mottram@codethink.co.uk>
Subject: Re: linux-next: manual merge of the irqchip tree with the tegra tree
References: <20150316145508.62cad7d0@canb.auug.org.au>
In-Reply-To: <20150316145508.62cad7d0@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 16/03/15 03:55, Stephen Rothwell wrote:
> Hi Jason,
> 
> Today's linux-next merge of the irqchip tree got a conflict in
> arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix
> big-endian issue with IRQ code") from the tegra tree and commit
> 1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip
> tree.
> 
> I fixed it up (the latter removed the code changed by the former) and
> can carry the fix as necessary (no action is required).

That looks good.

Thanks Stephen.

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