linux-kernel - linux-next: manual merge of the akpm-current tree with the rcu 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: <20140210150047.65f06219ffa970ad34d27d7f@canb.auug.org.au>
Date:	Mon, 10 Feb 2014 15:00:47 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Rientjes <rientjes@...gle.com>
Subject: linux-next: manual merge of the akpm-current tree with the rcu tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/slub.c between commit f4e40a71719d ("slub: Fix add_full() lockdep
checks") from the rcu tree and commit aee03fe7a7c8 ("mm/slub.c: list_lock
may not be held in some circumstances") from the akpm-current tree.

These patches try to achieve the same thing, so I arbitrarily chose the
version from the akpm-current tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped