All of lore.kernel.org
 help / color / mirror / Atom feed
* wireless.git rebased from 0a08adeb773cb6ed79b482c12bd45e37c2fa583b
@ 2012-07-09 18:46 John W. Linville
  2012-07-09 19:03 ` John W. Linville
  0 siblings, 1 reply; 3+ messages in thread
From: John W. Linville @ 2012-07-09 18:46 UTC (permalink / raw)
  To: linux-wireless

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: wireless.git rebased from 0a08adeb773cb6ed79b482c12bd45e37c2fa583b
  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   ` wireless-next.git rebased as well John W. Linville
  0 siblings, 1 reply; 3+ messages in thread
From: John W. Linville @ 2012-07-09 19:03 UTC (permalink / raw)
  To: linux-wireless

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* wireless-next.git rebased as well...
  2012-07-09 19:03 ` John W. Linville
@ 2012-07-09 20:46   ` John W. Linville
  0 siblings, 0 replies; 3+ messages in thread
From: John W. Linville @ 2012-07-09 20:46 UTC (permalink / raw)
  To: linux-wireless

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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-07-09 21:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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   ` wireless-next.git rebased as well John W. Linville

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.