Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758076Ab1ELQzF (ORCPT ); Thu, 12 May 2011 12:55:05 -0400 Received: from kroah.org ([198.145.64.141]:40952 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758027Ab1ELQzC (ORCPT ); Thu, 12 May 2011 12:55:02 -0400 Date: Thu, 12 May 2011 09:54:59 -0700 From: Greg KH To: Par-Gunnar HJALMDAHL Cc: Greg Kroah-Hartman , "devel@driverdev.osuosl.org" , Linus Walleij , "linux-kernel@vger.kernel.org" , "linux-bluetooth@vger.kernel.org" , Pavan Savoy , Vitaly Wool , Alan Cox , Arnd Bergmann , Marcel Holtmann , Lukasz Rymanowski , Linus WALLEIJ , Par-Gunnar Hjalmdahl , Lee Jones , Mathieu Poirier Subject: Re: [PATCH v6] staging: Add ST-Ericsson CG2900 driver Message-ID: <20110512165459.GA14243@kroah.com> References: <1305040232-750-1-git-send-email-par-gunnar.p.hjalmdahl@stericsson.com> <20110510200801.GA8125@kroah.com> <20110511134859.GB12717@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1434 Lines: 36 On Thu, May 12, 2011 at 01:54:46PM +0200, Par-Gunnar HJALMDAHL wrote: > Hi Greg, > > I downloaded you staging tree and compared the logs for the core.h file. > Compared to linux-next tag next-20110510 it is missing 2 commits: > 4dbee6b76fffd5740e87e286f4f4c1c15901bcae > 558aa9c0d620b91a896d5e39ce8a570bed65589b > where the first one is the "oldest" one in the log and is the most > important one for my patch. What trees are these patches coming from? > Another option would be for me to fix the patch for your tree, but > then I would probably have to fix it back in a few days when you update > your staging tree to Linux-next. How often is your tree updated? linux-next pulls from my tree, I don't pull from linux-next. As I don't see those patches in Linus's tree, I can't merge my tree forward to include them yet. I could take those patches also through my tree if you want me to, or you could send this patch through the mfd tree so that things build properly there too. > The easiest is probably to wait a few days until you have the next-20110510 > tag in your tree and then apply the patch. That will never happen, see above for how linux-next works. thanks, greg k-h -- 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/