linux-kernel - Re: linux-next: manual merge of the tip tree with the wireless 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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 17 May 2011 17:21:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	paulmck@...ux.vnet.ibm.com
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lai Jiangshan <laijs@...fujitsu.com>,
	"David S. Miller" <davem@...emloft.net>,
	"John W. Linville" <linville@...driver.com>,
	Johannes Berg <johannes.berg@...el.com>
Subject: Re: linux-next: manual merge of the tip tree with the wireless tree

Hi Paul,

On Tue, 17 May 2011 00:05:58 -0700 "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com> wrote:
>
> One of these is mine in -tip (0744371aeb).  Please let me know what
> I should be doing about it.

In this case, I would say absolutely nothing (assuming I did the
resolution correctly) :-)  If I can figure it out, Linus can as well and
will do so when these trees hit his in a week or so.

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

Content of type "application/pgp-signature" skipped