lkml.org 
[lkml]   [2011]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the slab tree
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-09-28 11:05    [W:0.326 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site