All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: linux-wireless@vger.kernel.org
Subject: Re: Please pull 'upstream' branch of wireless-2.6 (2007-02-14)
Date: Sat, 17 Feb 2007 18:36:50 -0500	[thread overview]
Message-ID: <20070217233650.GA4310@tuxdriver.com> (raw)
In-Reply-To: <45D7647B.8090704@garzik.org>

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

Thanks!

John
-- 
John W. Linville
linville@tuxdriver.com

  reply	other threads:[~2007-02-18  0:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-14 21:28 Please pull 'upstream' branch of wireless-2.6 (2007-02-14) John W. Linville
2007-02-17 20:24 ` Jeff Garzik
2007-02-17 23:36   ` John W. Linville [this message]
2007-02-20 16:28     ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070217233650.GA4310@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=jeff@garzik.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.