From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153AbbCPKFM (ORCPT ); Mon, 16 Mar 2015 06:05:12 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:13210 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751450AbbCPKFI (ORCPT ); Mon, 16 Mar 2015 06:05:08 -0400 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Mon, 16 Mar 2015 03:03:23 -0700 Date: Mon, 16 Mar 2015 11:04:58 +0100 From: Thierry Reding To: Jason Cooper CC: Stephen Rothwell , Stephen Warren , Colin Cross , Olof Johansson , , , Marc Zyngier , Bob Mottram Subject: Re: linux-next: manual merge of the irqchip tree with the tegra tree Message-ID: <20150316100457.GF30817@ulmo.nvidia.com> References: <20150316145508.62cad7d0@canb.auug.org.au> MIME-Version: 1.0 In-Reply-To: <20150316145508.62cad7d0@canb.auug.org.au> X-NVConfidentiality: public User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [10.2.68.46] X-ClientProxiedBy: UKMAIL102.nvidia.com (10.26.138.15) To UKMAIL101.nvidia.com (10.26.138.13) Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="lkTb+7nhmha7W+c3" Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --lkTb+7nhmha7W+c3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote: > * PGP Signed by an unknown key >=20 > Hi Jason, >=20 > 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. >=20 > 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. Another alternative, if you're okay with it, would be for you to ack the series and back it out of your tree and I'll take it through the Tegra tree (I could also provide a stable branch if necessary). Thierry --lkTb+7nhmha7W+c3 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVBqrGAAoJEN0jrNd/PrOhsuoP/3buhDPD+OQAzc4kD6XTdRHW 6VNhx08SnNa+hto2VMTivtyfiO01O/l4iOmPjdxynGO0pTvELYdwstN/NrdiqE6f pUFCq17XwuEHsc8V57I9u/4PmC9B/rwdYjP21VEgvd49jqTOBX7OibmFYKo50+7b 2HyxX5GFShGsv+qfiXvLhmdcIQCn6xfeOTzcxJ81p0sJTjA0UkeS0gKJ41lHCety aTGXN3u6VpCkW6yCIW2woeAhfoEn6sn/qG4arNsN/QABOBdrptrGrfTYN+f/u9SD 8rZ33gIdCZVbjBpAZ9ehsk3uwX7FjeQSnfDVxzjDFK85E0btiYmwMnIccZUzSgbr WyxbeX2kag6By9meLlmpK+HfTKIcEoMzvyDPVq0Nx9Bu+zUqlQx3rLk+9fvMAmTt SE1YhfkW9xCC3uEObc6Xr+G6vHeOSx35448VZIfnPp9YYiYC4r2Ki6IhHv4DibFj E9rTyFrvChRlyipQks+jHXLI0msCtXhyp4O3uECY3s5EvoxfcCSPhGfm1rkyKQK7 5KXeVDrbOcx5s/x4Pndc+73tJ/fac9+2SOH1LeWmOZxlpY+MbPyUukd3ZBKRkmuS PA8e2JcbauwmjCiqYb1YVrbrzL8vSsGQk1J0D0xO4B+cg7uOr4xppdgmoBXwS3yX 6i8EZs/MsbqPgX/nQyNR =/Y3F -----END PGP SIGNATURE----- --lkTb+7nhmha7W+c3--