public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Jeff Garzik <jeff@garzik•org>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: netdev@vger•kernel.org
Subject: Re: Please pull 'upstream' branch of wireless-2.6 (revised)
Date: Fri, 30 Jun 2006 12:31:00 -0400	[thread overview]
Message-ID: <44A551C4.8090208@garzik.org> (raw)
In-Reply-To: <20060628004838.GA15906@tuxdriver.com>

John W. Linville wrote:
> On Mon, Jun 26, 2006 at 05:25:52PM -0400, John W. Linville wrote:
> 
>> Michael Buesch:
>>       bcm43xx: suspend MAC while executing long pwork
> 
> The above patch ruffled some feathers on netdev.  In the interest of
> moving things along, I have pulled that patch out of wireless-2.6.
> I expect it will be back soon, probably with some additional changes
> to satisfy concerns raised on the mailing list.
> 
> NOTE: While I was mucking around, I pulled a bunch of patches from
> the master branch out into driver-specific branches for adm8211,
> prism54usb, tiacx, and zd1211rw.  Then I rebuilt the master branch
> by pulling from the driver branches.  This is intended to ease the
> merging of individual drivers upstream (e.g. zd1211rw and maybe tiacx
> in the near future).
> 
> Those working off my upstream branch or off Linus' tree should be
> unaffected.  Anyone who works off my master branch may need to rebase,
> especially if they want me to be able to pull from them (due to dirty
> history).  I apologize for the hassle and appreciate your cooperation!
> 
> Thanks,
> 
> John
> ---
> 
> The following changes since commit fcc18e83e1f6fd9fa6b333735bf0fcd530655511:
>   Malcolm Parsons:
>         uclinux: use PER_LINUX_32BIT in binfmt_flat
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream

nothing pulled?



  parent reply	other threads:[~2006-06-30 16:31 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-26 21:25 Please pull 'upstream' branch of wireless-2.6 John W. Linville
2006-06-27  2:06 ` Jeff Garzik
2006-06-27  2:27   ` Larry Finger
2006-06-27  3:50     ` Jeff Garzik
2006-06-27 13:30     ` Michael Buesch
2006-06-27 14:11       ` Jeff Garzik
2006-06-27 14:34         ` Larry Finger
2006-06-27 14:36         ` Michael Buesch
2006-06-27 16:10           ` Jeff Garzik
2006-06-27 16:23             ` Michael Buesch
2006-06-27 15:25         ` Michael Buesch
2006-06-27 16:12           ` Jeff Garzik
2006-06-27 16:31             ` Michael Buesch
2006-06-27 19:33               ` John W. Linville
2006-06-27 19:47                 ` Michael Buesch
2006-06-27 20:06                   ` Larry Finger
2006-06-27 20:23                     ` Michael Buesch
2006-06-27 20:37                       ` Larry Finger
2006-06-28 14:34                         ` Michael Buesch
2006-06-28 16:04                           ` Larry Finger
2006-06-28 16:32                             ` Michael Buesch
2006-06-28 17:32                               ` Larry Finger
2006-06-28 18:02                                 ` Michael Buesch
2006-06-27 16:52             ` Joseph Jezak
2006-06-28  0:48 ` Please pull 'upstream' branch of wireless-2.6 (revised) John W. Linville
2006-06-28 17:36   ` Please pull 'zd1211rw' branch of wireless-2.6 (new driver) John W. Linville
2006-06-30 16:29     ` Jeff Garzik
2006-06-30 16:31   ` Jeff Garzik [this message]
2006-06-30 19:27     ` Please pull 'upstream' branch of wireless-2.6 (revised) John W. Linville
2006-07-01 15:00       ` John W. Linville
2006-07-05 18:25       ` 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=44A551C4.8090208@garzik.org \
    --to=jeff@garzik$(echo .)org \
    --cc=linville@tuxdriver$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox