All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: linux-wireless@vger.kernel.org
Subject: wireless-next.git rebased as well...
Date: Mon, 9 Jul 2012 16:46:43 -0400	[thread overview]
Message-ID: <20120709204643.GG1348@tuxdriver.com> (raw)
In-Reply-To: <20120709190317.GD1348@tuxdriver.com>

Stupidly, I had speculatively pulled wireless.git into
wireless-next.git.  Having rebased one, now I have to rebase the
other...

In particular, I know that the NFC tree will be affected by this.
Other trees may be as well, particularly any with pending pull
requests that may have rebased on wireless-next in the past week or so.
Please be aware and adjust your trees now if possible.

Again, sorry for the confusion...

John

On Mon, Jul 09, 2012 at 03:03:18PM -0400, John W. Linville wrote:
> Actually, I took the opportunity to consolidate Thomas Huehn's two
> patches (one of which fixes the other).  So the actual base is from
> c9015b24 now.
> 
> Sorry for the added confusion...
> 
> On Mon, Jul 09, 2012 at 02:46:07PM -0400, John W. Linville wrote:
> > I had to drop a patch.  Everything up to 0a08adeb stays the same, so if
> > you don't already have that then you should still be able to just pull.
> > 
> > Sorry for the inconvenience!
> > 
> > John
> > -- 
> > John W. Linville		Someday the world will need a hero, and you
> > linville@tuxdriver.com			might be all we have.  Be ready.
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> 
> -- 
> John W. Linville		Someday the world will need a hero, and you
> linville@tuxdriver.com			might be all we have.  Be ready.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

      reply	other threads:[~2012-07-09 21:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-09 18:46 wireless.git rebased from 0a08adeb773cb6ed79b482c12bd45e37c2fa583b John W. Linville
2012-07-09 19:03 ` John W. Linville
2012-07-09 20:46   ` John W. Linville [this message]

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=20120709204643.GG1348@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --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.