From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756901AbbCRSrD (ORCPT ); Wed, 18 Mar 2015 14:47:03 -0400 Received: from ftx-008-i773.relay.mailchannels.net ([50.61.143.73]:1855 "EHLO relay.mailchannels.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754842AbbCRSq5 (ORCPT ); Wed, 18 Mar 2015 14:46:57 -0400 X-Sender-Id: duocircle|x-authuser|jac299792458 X-Sender-Id: duocircle|x-authuser|jac299792458 X-MC-Relay: Neutral X-MailChannels-SenderId: duocircle|x-authuser|jac299792458 X-MailChannels-Auth-Id: duocircle X-MC-Loop-Signature: 1426704412474:4228832011 X-MC-Ingress-Time: 1426704412474 X-Mail-Handler: DuoCircle Outbound SMTP X-Originating-IP: 72.84.113.125 X-Report-Abuse-To: abuse@duocircle.com (see https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information for abuse reporting information) X-MHO-User: U2FsdGVkX1/qL5vMO29a+6TAPRQZUMJNuszXweGzA+c= X-DKIM: OpenDKIM Filter v2.6.8 io B5F738052A Date: Tue, 17 Mar 2015 13:21:29 +0000 From: Jason Cooper To: Thierry Reding Cc: Stephen Rothwell , Stephen Warren , Colin Cross , Olof Johansson , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Zyngier , Bob Mottram Subject: Re: linux-next: manual merge of the irqchip tree with the tegra tree Message-ID: <20150317132129.GB3368@io.lakedaemon.net> References: <20150316145508.62cad7d0@canb.auug.org.au> <20150316100457.GF30817@ulmo.nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150316100457.GF30817@ulmo.nvidia.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-AuthUser: jac299792458 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 16, 2015 at 11:04:58AM +0100, Thierry Reding wrote: > On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote: > > * PGP Signed by an unknown key > > > > 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). > > Hi Jason, > > There's a chance that we might get a couple of other patches for Tegra > that conflict with this series. Would you be able to provide a stable > branch that I can pull into the Tegra tree to resolve those. git://git.infradead.org/users/jcooper/linux.git irqchip/stacked-tegra is now stable. It's based on v4.0-rc1 and only contains this series. thx, Jason.