netdev - Re: pull request: wireless-next-2.6 2008-08-29

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080830125833.GC11718@tuxdriver.com>
Date:	Sat, 30 Aug 2008 08:58:33 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	David Miller <davem@...emloft.net>
Cc:	linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: pull request: wireless-next-2.6 2008-08-29

On Fri, Aug 29, 2008 at 02:03:03PM -0700, David Miller wrote:
> From: "John W. Linville" <linville@...driver.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@...driver.com
--
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