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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpyw2q0Mq1Pe.pgp
Description: PGP signature
