linux-kernel - Re: linux-next: manual merge of the wireless tree with the wireless-current tree

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: <20100311140409.a9ae210c.sfr@canb.auug.org.au>
Date:	Thu, 11 Mar 2010 14:04:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Bruno Randolf <br1@...fach.org>
Cc:	"John W. Linville" <linville@...driver.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the wireless tree with the
 wireless-current tree

Hi Bruno,

On Thu, 11 Mar 2010 11:38:11 +0900 Bruno Randolf <br1@...fach.org> wrote:
>
> not sure what happened...
> 
> but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an older 
> version of my patch. i have sent one which applies cleanly later on.

The tree I call wireless-current usually only contains bug fixes, the
tree I call wireless is stuff for the next release ...

> your fix is correct, though.

Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped