linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: linville@tuxdriver.com
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull request: wireless-2.6 2008-02-28
Date: Thu, 28 Feb 2008 11:22:29 -0800 (PST)	[thread overview]
Message-ID: <20080228.112229.135415548.davem@davemloft.net> (raw)
In-Reply-To: <20080228145136.GD3063@tuxdriver.com>

From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 28 Feb 2008 09:51:36 -0500

> This version drops the "Fix b43 drivers build for arm" patch, and adds a
> one-line build fix for SSB-attached PCI cores (found on bcm47xx mips).

Thanks.

> P.S. This will create a merge conflict with the code I already
> requested that you pull for net-2.6.26.  The merge is easily resolved,
> since it is two "comment block + single statement" additions at the
> same place in the file.  Just take both sets of changes, and order
> the "Evalue antenna setup" group _after_ the "Send a signal to the
> led" group.  I have the conflict corrected in my wireless-testing
> tree for reference if you need it.

Understood.

> The following changes since commit d9595a7b9c777d45a74774f1428c263a0a47f4c0:
>   David S. Miller (1):
>         [AF_KEY]: Fix oops by converting to proc_net_*().
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master

Pulled and pushed back out, thanks John!

  reply	other threads:[~2008-02-28 19:22 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-28  1:41 pull request: wireless-2.6 2008-02-27 John W. Linville
2008-02-28  7:51 ` David Miller
2008-02-28 14:51   ` pull request: wireless-2.6 2008-02-28 John W. Linville
2008-02-28 19:22     ` David Miller [this message]
2008-02-28 21:21   ` pull request: wireless-2.6 2008-02-27 Gordon Farquharson
2008-02-28 21:30     ` David Miller
2008-02-28 23:56       ` Gordon Farquharson
2008-02-29  0:15         ` David Miller
2008-02-29 12:16       ` Michael Buesch
2008-02-29 16:26         ` John W. Linville
2008-02-29 16:34           ` Johannes Berg
2008-02-29 19:10             ` John W. Linville
2008-02-29 19:54               ` Johannes Berg
2008-02-29 21:42               ` John W. Linville
2008-03-01 13:01                 ` Sam Ravnborg
2008-03-01 15:51                   ` Michael Buesch
2008-03-02 11:58                     ` Sam Ravnborg
2008-03-02 20:00                       ` Gordon Farquharson
2008-03-02 20:25                         ` Michael Buesch
2008-03-18  4:07                       ` Gordon Farquharson
2008-03-23 20:51                         ` Sam Ravnborg
2008-03-23 21:23                           ` Gordon Farquharson
2008-03-01 22:59                   ` David Miller
2008-03-02 15:44                   ` Adrian Bunk
2008-02-29 23:13             ` Michael Buesch
2008-02-29 23:51               ` Randy Dunlap

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=20080228.112229.135415548.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).