---

yaml
---
r: 350268
b: refs/heads/master
c: 42f8570
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1eaec8212e35aef6606a4e8b40aa9ad9ba87672a
+refs/heads/master: 42f8570f437b65aaf3ef176a38ad7d7fc5847d8b

trunk/Documentation/ABI/stable/sysfs-devices-node

@@ -1,101 +1,7 @@
-What:		/sys/devices/system/node/possible
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that could be possibly become online at some point.
-
-What:		/sys/devices/system/node/online
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that are online.
-
-What:		/sys/devices/system/node/has_normal_memory
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that have regular memory.
-
-What:		/sys/devices/system/node/has_cpu
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that have one or more CPUs.
-
-What:		/sys/devices/system/node/has_high_memory
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that have regular or high memory.
-		Depends on CONFIG_HIGHMEM.
-
 What:		/sys/devices/system/node/nodeX
 Date:		October 2002
 Contact:	Linux Memory Management list <linux-mm@kvack.org>
 Description:
 		When CONFIG_NUMA is enabled, this is a directory containing
 		information on node X such as what CPUs are local to the
-		node. Each file is detailed next.
-
-What:		/sys/devices/system/node/nodeX/cpumap
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The node's cpumap.
-
-What:		/sys/devices/system/node/nodeX/cpulist
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The CPUs associated to the node.
-
-What:		/sys/devices/system/node/nodeX/meminfo
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Provides information about the node's distribution and memory
-		utilization. Similar to /proc/meminfo, see Documentation/filesystems/proc.txt
-
-What:		/sys/devices/system/node/nodeX/numastat
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The node's hit/miss statistics, in units of pages.
-		See Documentation/numastat.txt
-
-What:		/sys/devices/system/node/nodeX/distance
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Distance between the node and all the other nodes
-		in the system.
-
-What:		/sys/devices/system/node/nodeX/vmstat
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The node's zoned virtual memory statistics.
-		This is a superset of numastat.
-
-What:		/sys/devices/system/node/nodeX/compact
-Date:		February 2010
-Contact:	Mel Gorman <mel@csn.ul.ie>
-Description:
-		When this file is written to, all memory within that node
-		will be compacted. When it completes, memory will be freed
-		into blocks which have as many contiguous pages as possible
-
-What:		/sys/devices/system/node/nodeX/scan_unevictable_pages
-Date:		October 2008
-Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>
-Description:
-		When set, it triggers scanning the node's unevictable lists
-		and move any pages that have become evictable onto the respective
-		zone's inactive list. See mm/vmscan.c
-
-What:		/sys/devices/system/node/nodeX/hugepages/hugepages-<size>/
-Date:		December 2009
-Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>
-Description:
-		The node's huge page size control/query attributes.
-		See Documentation/vm/hugetlbpage.txt
+		node.

trunk/Documentation/ABI/testing/ima_policy

@@ -23,7 +23,7 @@ Description:
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
 
-		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK][MODULE_CHECK]
+		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
 			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
 			fsmagic:= hex value
 			uid:= decimal value
@@ -53,7 +53,6 @@ Description:
 			measure func=BPRM_CHECK
 			measure func=FILE_MMAP mask=MAY_EXEC
 			measure func=FILE_CHECK mask=MAY_READ uid=0
-			measure func=MODULE_CHECK uid=0
 			appraise fowner=0
 
 		The default policy measures all executables in bprm_check,

trunk/Documentation/ABI/testing/sysfs-bus-rbd

@@ -70,10 +70,6 @@ snap_*
 
 	A directory per each snapshot
 
-parent
-
-	Information identifying the pool, image, and snapshot id for
-	the parent image in a layered rbd image (format 2 only).
 
 Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
 -------------------------------------------------------------

trunk/Documentation/ABI/testing/sysfs-devices-node

@@ -0,0 +1,7 @@
+What:		/sys/devices/system/node/nodeX/compact
+Date:		February 2010
+Contact:	Mel Gorman <mel@csn.ul.ie>
+Description:
+		When this file is written to, all memory within that node
+		will be compacted. When it completes, memory will be freed
+		into blocks which have as many contiguous pages as possible