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

Message-Id: <20120510185155.47d24f37951786b64af97868@canb.auug.org.au>
Date:	Thu, 10 May 2012 18:51:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andi Kleen <ak@...ux.intel.com>,
	Rusty Russell <rusty@...tcorp.com.au>
Subject: linux-next: manual merge of the akpm tree with the rr tree

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
kernel/lglock.c, include/linux/lglock.h, fs/namespace.c and fs/internal.h
between various commits from the rr tree and commit "brlocks/lglocks:
cleanups" from the akpm tree.

The akpm tree patch seems to be a merge of the rr tree commits, so I
dropped the akpm tree patch.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped