Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753636AbZK3JZl (ORCPT ); Mon, 30 Nov 2009 04:25:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752894AbZK3JZk (ORCPT ); Mon, 30 Nov 2009 04:25:40 -0500 Received: from inca-roads.misterjones.org ([213.251.177.50]:44067 "EHLO inca-roads.misterjones.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580AbZK3JZh (ORCPT ); Mon, 30 Nov 2009 04:25:37 -0500 Date: Mon, 30 Nov 2009 10:24:44 +0100 From: Marc Zyngier To: Eric Miao Cc: Stephen Rothwell , Dominik Brodowski , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King - ARM Linux Subject: Re: linux-next: manual merge of the pcmcia tree with the pxa tree Message-ID: <20091130102444.4ebc0a45@life-in-the-fast-lane> In-Reply-To: References: <20091130131627.8ccc6033.sfr@canb.auug.org.au> <20091130091007.7a5fd554@hina.wild-wind.fr.eu.org> Organization: Metropolis -- Nowhere X-Mailer: Claws Mail 3.7.3 (GTK+ 2.14.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 82.210.249.81 X-SA-Exim-Rcpt-To: eric.y.miao@gmail.com, sfr@canb.auug.org.au, linux@dominikbrodowski.net, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk X-SA-Exim-Mail-From: maz@misterjones.org X-SA-Exim-Scanned: No (on inca-roads.misterjones.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1400 Lines: 43 On Mon, 30 Nov 2009 16:16:38 +0800 Eric Miao wrote: > On Mon, Nov 30, 2009 at 4:10 PM, Marc Zyngier > wrote: > > On Mon, 30 Nov 2009 11:17:08 +0800 > > Eric Miao wrote: > > > > Hi Eric, > > > >> Could you take a look into this, I wonder you may need to rebase > >> against Russell's PCMCIA generalization stuffs. Let me know if you > >> want me to drop this patch. > > > > Patch looks good. I'm more worried about creating dependencies > > between trees: > > > > - Stephen fix depends on Russell's changes, which are in Dominik's > > tree, > > - My patch depends on Zeus support, which is in your tree, > > - Rebasing Zeus PCMCIA support against Dominik's tree is just > > another dependency between the two trees. > > > > Should we drop my PCMCIA changes until both Russell's changes and > > main Zeus support are merged? > > > > I'd propose to postpone your patches until dependency is resolved, > will send a second git pull til then. Sounds OK to you? Sounds good. I'll post rebased patches as soon as PCMCIA hits Linus' tree. Thanks, M. -- Fast. Cheap. Reliable. Pick two. -- 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/