linux-kernel - Re: linux-next: manual merge of the akpm tree with the slab 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: <20110928091005.GA7203@albatros>
Date:	Wed, 28 Sep 2011 13:10:05 +0400
From:	Vasiliy Kulikov <segoon@...nwall.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pekka Enberg <penberg@...helsinki.fi>,
	Christoph Lameter <cl@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the akpm tree with the slab tree

On Wed, Sep 28, 2011 at 19:01 +1000, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in mm/slab.c
> between commit ab067e99d22e ("mm: restrict access to slab files under
> procfs and sysfs") from the slab tree and commit ea14c46ee4d9 ("mm:
> restrict access to /proc/slabinfo") from the akpm tree.
> 
> The former is a superset of the latter, so I dropped that patch from the
> akpm tree.

Oops, sorry, Andrew, I would send the patch with /sys/kernel/slab/ only
if I knew that you've picked the first patch (I didn't receive a tip).
Where does -mm tree lives now?

Thanks,

-- 
Vasiliy Kulikov
http://www.openwall.com - bringing security into open computing environments
--
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/