netdev - Re: pull request: wireless-next-2.6 2008-11-18

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 20 Nov 2008 09:43:01 -0500
From:	"John W. Linville" <linville@...driver.com>
To:	David Miller <davem@...emloft.net>
Cc:	linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
	sfr@...b.auug.org.au
Subject: Re: pull request: wireless-next-2.6 2008-11-18

On Thu, Nov 20, 2008 at 05:03:48AM -0800, David Miller wrote:
> From: "John W. Linville" <linville@...driver.com>
> Date: Tue, 18 Nov 2008 19:08:52 -0500
> 
> > Here is another big round of updates intended for 2.6.29.  This batch is
> > mostly driver updates as well as a bunch of file movement.  Also, some
> > patches from me are working towards refactoring/minimizing the old
> > ieee80211 component into a support library for ipw2100 and ipw2200 and
> > also collecting more code into lib80211 for sharing between more
> > drivers.
> > 
> > Please let me know if there are problems!
>  ...
> > P.S.  I have included a merge-test branch as an example of how the
> > merge conflicts with the wireless-2.6 pull request from today should
> > be resolved.
> 
> John, I took the stable fixes and those are in the pull request
> I just sent to Linus.
> 
> Once he takes that in I'll merge those bits into net-next-2.6 and
> resolve the conflicts created solely by that merge.
> 
> What I think makes sense right now for your net-next-2.6 stuff is
> for you to just sit tight until I do the merge, then you can respin
> your tree, include Rami Rosen's build fix, and take care of the
> remaining merge issues at the same time.
> 
> I'll post on netdev when I do the merging, as I usually do.

Sure, that sounds fine...thanks!

John
-- 
John W. Linville		Linux should be at the core
linville@...driver.com			of your literate lifestyle.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html