From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: pull request: wireless-next-2.6 2008-08-29
Date: Sat, 30 Aug 2008 08:58:33 -0400 [thread overview]
Message-ID: <20080830125833.GC11718@tuxdriver.com> (raw)
In-Reply-To: <20080829.140303.71048853.davem@davemloft.net>
On Fri, Aug 29, 2008 at 02:03:03PM -0700, David Miller wrote:
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Fri, 29 Aug 2008 16:54:14 -0400
>
> > Here is this week's supply of stuff for -next -- mostly cleanups and
> > other driver updates. Please let me know if there are problems!
> ...
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master
>
> I'm pulling this, thanks John.
>
> I hope to get a chance tonight to deal with that net-2.6 vs. net-next-2.6
> wireless conflict by doing a merge. It had to do with that IBSS message
> your ifdef'd out in net-2.6
Ah, yes...it looks trivial to fix, but the trivial fix won't build!
I have it fixed here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merged-test
And the fixed file is the same as what is in wireless-testing.
Hth!
John
--
John W. Linville
linville@tuxdriver.com
WARNING: multiple messages have this Message-ID (diff)
From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
To: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: pull request: wireless-next-2.6 2008-08-29
Date: Sat, 30 Aug 2008 08:58:33 -0400 [thread overview]
Message-ID: <20080830125833.GC11718@tuxdriver.com> (raw)
In-Reply-To: <20080829.140303.71048853.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
On Fri, Aug 29, 2008 at 02:03:03PM -0700, David Miller wrote:
> From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
> Date: Fri, 29 Aug 2008 16:54:14 -0400
>
> > Here is this week's supply of stuff for -next -- mostly cleanups and
> > other driver updates. Please let me know if there are problems!
> ...
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master
>
> I'm pulling this, thanks John.
>
> I hope to get a chance tonight to deal with that net-2.6 vs. net-next-2.6
> wireless conflict by doing a merge. It had to do with that IBSS message
> your ifdef'd out in net-2.6
Ah, yes...it looks trivial to fix, but the trivial fix won't build!
I have it fixed here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merged-test
And the fixed file is the same as what is in wireless-testing.
Hth!
John
--
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2008-08-30 13:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-29 20:54 pull request: wireless-next-2.6 2008-08-29 John W. Linville
2008-08-29 20:54 ` John W. Linville
2008-08-29 21:03 ` David Miller
2008-08-30 12:58 ` John W. Linville [this message]
2008-08-30 12:58 ` John W. Linville
2008-08-30 19:23 ` David Miller
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=20080830125833.GC11718@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--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 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.