From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from havoc.gtf.org ([69.61.125.42]:50473 "EHLO havoc.gtf.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760160AbXKHRxa (ORCPT ); Thu, 8 Nov 2007 12:53:30 -0500 Date: Thu, 8 Nov 2007 12:53:28 -0500 From: Jeff Garzik To: "John W. Linville" Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Subject: Re: Please pull 'fixes-jgarzik' branch of wireless-2.6 (3rd time is the charm?) Message-ID: <20071108175328.GA3491@havoc.gtf.org> (sfid-20071108_175741_677636_78B993B2) References: <20071108142626.GH11957@tuxdriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20071108142626.GH11957@tuxdriver.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Nov 08, 2007 at 09:26:26AM -0500, John W. Linville wrote: > Jeff, > > OK, I think things are settled now. I apologize for the confusion. > > These are fixes intended for 2.6.24. Please note that three of the > patches from Michael Buesch in the list below were already sent to > you directed for 2.6.25. Upon further review, I think they belong in > 2.6.24 instead. I cherry-picked them, so I'm fairly certain git will > be smart enough to drop them from your 2.6.25 branch when you rebase. > > Please let me know if there are any problems. > > Thanks! > > John > > --- > > Individual patches are available here: > > http://www.kernel.org/pub//linux/kernel/people/linville/wireless-2.6/fixes-jgarzik/ > pulled into #upstream-fixes; please check the merge in #upstream