---

yaml
---
r: 333986
b: refs/heads/master
c: 9317051
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e225ca27057e70e7cbb14ae4c1e5f758973af645
+refs/heads/master: 93170516a4d64319ffcc43bc9dd61f12775bd297

trunk/Documentation/00-INDEX

@@ -270,6 +270,8 @@ preempt-locking.txt
 	- info on locking under a preemptive kernel.
 printk-formats.txt
 	- how to get printk format specifiers right
+prio_tree.txt
+	- info on radix-priority-search-tree use for indexing vmas.
 ramoops.txt
 	- documentation of the ramoops oops/panic logging module.
 rbtree.txt

trunk/Documentation/ABI/obsolete/proc-pid-oom_adj

@@ -0,0 +1,22 @@
+What:	/proc/<pid>/oom_adj
+When:	August 2012
+Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
+	badness heuristic used to determine which task to kill when the kernel
+	is out of memory.
+
+	The badness heuristic has since been rewritten since the introduction of
+	this tunable such that its meaning is deprecated.  The value was
+	implemented as a bitshift on a score generated by the badness()
+	function that did not have any precise units of measure.  With the
+	rewrite, the score is given as a proportion of available memory to the
+	task allocating pages, so using a bitshift which grows the score
+	exponentially is, thus, impossible to tune with fine granularity.
+
+	A much more powerful interface, /proc/<pid>/oom_score_adj, was
+	introduced with the oom killer rewrite that allows users to increase or
+	decrease the badness score linearly.  This interface will replace
+	/proc/<pid>/oom_adj.
+
+	A warning will be emitted to the kernel log if an application uses this
+	deprecated interface.  After it is printed once, future warnings will be
+	suppressed until the kernel is rebooted.

trunk/Documentation/ABI/testing/ima_policy

@@ -12,65 +12,48 @@ Description:
 		then closing the file.  The new policy takes effect after
 		the file ima/policy is closed.
 
-		IMA appraisal, if configured, uses these file measurements
-		for local measurement appraisal.
-
 		rule format: action [condition ...]
 
-		action: measure | dont_measure | appraise | dont_appraise | audit
+		action: measure | dont_measure
 		condition:= base | lsm
-			base:	[[func=] [mask=] [fsmagic=] [uid=] [fowner]]
+			base:	[[func=] [mask=] [fsmagic=] [uid=]]
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
 
 		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
 			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
 			fsmagic:= hex value
 			uid:= decimal value
-			fowner:=decimal value
 		lsm:  	are LSM specific
 
 		default policy:
 			# PROC_SUPER_MAGIC
 			dont_measure fsmagic=0x9fa0
-			dont_appraise fsmagic=0x9fa0
 			# SYSFS_MAGIC
 			dont_measure fsmagic=0x62656572
-			dont_appraise fsmagic=0x62656572
 			# DEBUGFS_MAGIC
 			dont_measure fsmagic=0x64626720
-			dont_appraise fsmagic=0x64626720
 			# TMPFS_MAGIC
 			dont_measure fsmagic=0x01021994
-			dont_appraise fsmagic=0x01021994
-			# RAMFS_MAGIC
-			dont_measure fsmagic=0x858458f6
-			dont_appraise fsmagic=0x858458f6
 			# SECURITYFS_MAGIC
 			dont_measure fsmagic=0x73636673
-			dont_appraise fsmagic=0x73636673
 
 			measure func=BPRM_CHECK
 			measure func=FILE_MMAP mask=MAY_EXEC
 			measure func=FILE_CHECK mask=MAY_READ uid=0
-			appraise fowner=0
 
 		The default policy measures all executables in bprm_check,
 		all files mmapped executable in file_mmap, and all files
-		open for read by root in do_filp_open.  The default appraisal
-		policy appraises all files owned by root.
+		open for read by root in do_filp_open.
 
 		Examples of LSM specific definitions:
 
 		SELinux:
 			# SELINUX_MAGIC
-			dont_measure fsmagic=0xf97cff8c
-			dont_appraise fsmagic=0xf97cff8c
+			dont_measure fsmagic=0xF97CFF8C
 
 			dont_measure obj_type=var_log_t
-			dont_appraise obj_type=var_log_t
 			dont_measure obj_type=auditd_log_t
-			dont_appraise obj_type=auditd_log_t
 			measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
 			measure subj_role=system_r func=FILE_CHECK mask=MAY_READ
 

trunk/Documentation/ABI/testing/sysfs-block

@@ -206,17 +206,3 @@ Description:
 		when a discarded area is read the discard_zeroes_data
 		parameter will be set to one. Otherwise it will be 0 and
 		the result of reading a discarded area is undefined.
-
-What:		/sys/block/<disk>/queue/write_same_max_bytes
-Date:		January 2012
-Contact:	Martin K. Petersen <martin.petersen@oracle.com>
-Description:
-		Some devices support a write same operation in which a
-		single data block can be written to a range of several
-		contiguous blocks on storage. This can be used to wipe
-		areas on disk or to initialize drives in a RAID
-		configuration. write_same_max_bytes indicates how many
-		bytes can be written in a single write same command. If
-		write_same_max_bytes is 0, write same is not supported
-		by the device.
-

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

@@ -25,10 +25,6 @@ client_id
 
 	The ceph unique client id that was assigned for this specific session.
 
-features
-
-	A hexadecimal encoding of the feature bits for this image.
-
 major
 
 	The block device major number.
@@ -37,11 +33,6 @@ name
 
 	The name of the rbd image.
 
-image_id
-
-	The unique id for the rbd image.  (For rbd image format 1
-	this is empty.)
-
 pool
 
 	The name of the storage pool where this rbd image resides.
@@ -66,6 +57,12 @@ current_snap
 
 	The current snapshot for which the device is mapped.
 
+create_snap
+
+	Create a snapshot:
+
+	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create
+
 snap_*
 
 	A directory per each snapshot
@@ -82,7 +79,4 @@ snap_size
 
 	The size of the image when this snapshot was taken.
 
-snap_features
-
-	A hexadecimal encoding of the feature bits for this snapshot.
 

trunk/Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -176,14 +176,3 @@ Description:	Disable L3 cache indices
 		All AMD processors with L3 caches provide this functionality.
 		For details, see BKDGs at
 		http://developer.amd.com/documentation/guides/Pages/default.aspx
-
-
-What:		/sys/devices/system/cpu/cpufreq/boost
-Date:		August 2012
-Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>
-Description:	Processor frequency boosting control
-
-		This switch controls the boost setting for the whole system.
-		Boosting allows the CPU and the firmware to run at a frequency
-		beyound it's nominal limit.
-		More details can be found in Documentation/cpu-freq/boost.txt

trunk/Documentation/ABI/testing/sysfs-fs-ext4

@@ -96,16 +96,3 @@ Contact:	"Theodore Ts'o" <tytso@mit.edu>
 Description:
 		The maximum number of megabytes the writeback code will
 		try to write out before move on to another inode.
-
-What:		/sys/fs/ext4/<disk>/extent_max_zeroout_kb
-Date:		August 2012
-Contact:	"Theodore Ts'o" <tytso@mit.edu>
-Description:
-		The maximum number of kilobytes which will be zeroed
-		out in preference to creating a new uninitialized
-		extent when manipulating an inode's extent tree.  Note
-		that using a larger value will increase the
-		variability of time necessary to complete a random
-		write operation (since a 4k random write might turn
-		into a much larger write due to the zeroout
-		operation).

trunk/Documentation/CodingStyle

@@ -454,16 +454,6 @@ The preferred style for long (multi-line) comments is:
 	 * with beginning and ending almost-blank lines.
 	 */
 
-For files in net/ and drivers/net/ the preferred style for long (multi-line)
-comments is a little different.
-
-	/* The preferred comment style for files in net/ and drivers/net
-	 * looks like this.
-	 *
-	 * It is nearly the same as the generally preferred comment style,
-	 * but there is no initial almost-blank line.
-	 */
-
 It's also important to comment data, whether they are basic types or derived
 types.  To this end, use just one data declaration per line (no commas for
 multiple data declarations).  This leaves you room for a small comment on each