From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull request: wireless-next-2.6 2010-07-01
Date: Fri, 2 Jul 2010 10:08:05 -0400 [thread overview]
Message-ID: <20100702140805.GA2381@tuxdriver.com> (raw)
In-Reply-To: <20100701.173550.172604489.davem@davemloft.net>
On Thu, Jul 01, 2010 at 05:35:50PM -0700, David Miller wrote:
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Thu, 1 Jul 2010 14:15:27 -0400
>
> > Two weeks since the last request, plenty of new stuff intended for
> > 2.6.36...
> >
> > Included are the usual bunch of driver updates, including a big
> > dump from the rt2x00 team. This also includes cfg80211 support
> > for libertas, a flurry of (mostly trivial) stuff from me, and a
> > wireless-2.6 pull to resolve some patch dependencies.
> >
> > Please let me know if there are problems!
>
> This failed to pull cleanly, I got a conflict in
> drivers/net/wireless/libertas/host.h It was the
> usual "__packed" vs. "__attribute__((packed))" thing.
>
> I resolved it but I wonder if this happened because you
> did the wireless-2.6 --> wireless-next-2.6 merge here.
Sorry, Dave! I probably should have done 'for-davem' branch for you.
Thanks for resolving it!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
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,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: pull request: wireless-next-2.6 2010-07-01
Date: Fri, 2 Jul 2010 10:08:05 -0400 [thread overview]
Message-ID: <20100702140805.GA2381@tuxdriver.com> (raw)
In-Reply-To: <20100701.173550.172604489.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
On Thu, Jul 01, 2010 at 05:35:50PM -0700, David Miller wrote:
> From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
> Date: Thu, 1 Jul 2010 14:15:27 -0400
>
> > Two weeks since the last request, plenty of new stuff intended for
> > 2.6.36...
> >
> > Included are the usual bunch of driver updates, including a big
> > dump from the rt2x00 team. This also includes cfg80211 support
> > for libertas, a flurry of (mostly trivial) stuff from me, and a
> > wireless-2.6 pull to resolve some patch dependencies.
> >
> > Please let me know if there are problems!
>
> This failed to pull cleanly, I got a conflict in
> drivers/net/wireless/libertas/host.h It was the
> usual "__packed" vs. "__attribute__((packed))" thing.
>
> I resolved it but I wonder if this happened because you
> did the wireless-2.6 --> wireless-next-2.6 merge here.
Sorry, Dave! I probably should have done 'for-davem' branch for you.
Thanks for resolving it!
John
--
John W. Linville Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org 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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2010-07-02 14:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 18:15 pull request: wireless-next-2.6 2010-07-01 John W. Linville
2010-07-01 18:15 ` John W. Linville
2010-07-02 0:35 ` David Miller
2010-07-02 14:08 ` John W. Linville [this message]
2010-07-02 14:08 ` John W. Linville
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=20100702140805.GA2381@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--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.