From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:44680 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030224AbXBTQ2z (ORCPT ); Tue, 20 Feb 2007 11:28:55 -0500 Message-ID: <45DB21C3.4040800@garzik.org> Date: Tue, 20 Feb 2007 11:28:51 -0500 From: Jeff Garzik MIME-Version: 1.0 To: "John W. Linville" CC: linux-wireless@vger.kernel.org Subject: Re: Please pull 'upstream' branch of wireless-2.6 (2007-02-14) References: <20070214212817.GB28318@tuxdriver.com> <45D7647B.8090704@garzik.org> <20070217233650.GA4310@tuxdriver.com> In-Reply-To: <20070217233650.GA4310@tuxdriver.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: John W. Linville wrote: > On Sat, Feb 17, 2007 at 03:24:27PM -0500, Jeff Garzik wrote: >> John W. Linville wrote: >>> Some late-breaking small and/or important changes before the 2.6.21 >>> merge window closes... > >> ACK. Tried to pull, but there were conflicts with netdev#upstream. >> Since there are dependencies in netdev#upstream, looks like you need to >> resend against that. > > Ah, yes...I cloned your 'upstream' branch, pulled from my > 'upstream' branch, resolved the conflicts, and committed on my new > 'upstream-jgarzik' branch. > > Please pull from here: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik pulled