From: Vasiliy Kulikov <segoon@openwall.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pekka Enberg <penberg@cs.helsinki.fi>,
Christoph Lameter <cl@linux-foundation.org>
Subject: Re: linux-next: manual merge of the akpm tree with the slab tree
Date: Wed, 28 Sep 2011 13:10:05 +0400 [thread overview]
Message-ID: <20110928091005.GA7203@albatros> (raw)
In-Reply-To: <20110928190158.d313ae65b9dcd0007fff0836@canb.auug.org.au>
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
next prev parent reply other threads:[~2011-09-28 9:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 9:01 linux-next: manual merge of the akpm tree with the slab tree Stephen Rothwell
2011-09-28 9:10 ` Vasiliy Kulikov [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-17 4:55 Stephen Rothwell
2011-09-14 6:24 Stephen Rothwell
2011-09-14 6:35 ` Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110928091005.GA7203@albatros \
--to=segoon@openwall.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).