Messages in this thread | | | Date | Wed, 28 Sep 2011 19:01:58 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |