linux-kernel - Re: pull request: wireless-2.6 2008-09-11

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]

Message-Id: <20080911.160952.107319416.davem@davemloft.net>
Date:	Thu, 11 Sep 2008 16:09:52 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	linville@...driver.com
Cc:	linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org, sfr@...b.auug.org.au
Subject: Re: pull request: wireless-2.6 2008-09-11

From: "John W. Linville" <linville@...driver.com>
Date: Thu, 11 Sep 2008 16:35:53 -0400

> BTW, this (obviously) introduces a merge conflict between
> wireless-2.6 and wireless-next-2.6.  The solution is trivial -- just
> take the wireless-next-2.6 version of the affected files.  Still, I
> have a sample merge available here:
>
> 	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merge-test

Ok, I just did the merge, please double check my work.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/