---

yaml
---
r: 332288
b: refs/heads/master
c: 4563f2c
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de390bba797aa9a554bc1769b6a8771605854d79
+refs/heads/master: 4563f2cc295e1094fc66e9d0cd9c5e4ea0616ae3

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-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-bus-usb

@@ -220,10 +220,3 @@ Description:
 		If the device doesn't support LTM, the file will read "no".
 		The file will be present for all speeds of USB devices, and will
 		always read "no" for USB 1.1 and USB 2.0 devices.
-
-What:		/sys/bus/usb/devices/.../(hub interface)/portX
-Date:		August 2012
-Contact:	Lan Tianyu <tianyu.lan@intel.com>
-Description:
-		The /sys/bus/usb/devices/.../(hub interface)/portX
-		is usb port device's sysfs directory.

trunk/Documentation/ABI/testing/sysfs-class-extcon

@@ -13,7 +13,7 @@ Description:
 		accessory cables have such capability. For example,
 		the 30-pin port of Nuri board (/arch/arm/mach-exynos)
 		may have both HDMI and Charger attached, or analog audio,
-		video, and USB cables attached simultaneously.
+		video, and USB cables attached simulteneously.
 
 		If there are cables mutually exclusive with each other,
 		such binary relations may be expressed with extcon_dev's
@@ -35,7 +35,7 @@ Description:
 		The /sys/class/extcon/.../state shows and stores the cable
 		attach/detach information of the corresponding extcon object.
 		If the extcon object has an optional callback "show_state"
-		defined, the showing function is overridden with the optional
+		defined, the showing function is overriden with the optional
 		callback.
 
 		If the default callback for showing function is used, the
@@ -46,19 +46,19 @@ Description:
 		TA=1
 		EAR_JACK=0
 		#
-		In this example, the extcon device has USB_OTG and TA
+		In this example, the extcon device have USB_OTG and TA
 		cables attached and HDMI and EAR_JACK cables detached.
 
 		In order to update the state of an extcon device, enter a hex
-		state number starting with 0x:
-		# echo 0xHEX > state
+		state number starting with 0x.
+		 echo 0xHEX > state
 
-		This updates the whole state of the extcon device.
+		This updates the whole state of the extcon dev.
 		Inputs of all the methods are required to meet the
-		mutually_exclusive conditions if they exist.
+		mutually_exclusive contidions if they exist.
 
 		It is recommended to use this "global" state interface if
-		you need to set the value atomically. The later state
+		you need to enter the value atomically. The later state
 		interface associated with each cable cannot update
 		multiple cable states of an extcon device simultaneously.
 
@@ -73,7 +73,7 @@ What:		/sys/class/extcon/.../cable.x/state
 Date:		February 2012
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-		The /sys/class/extcon/.../cable.x/state shows and stores the
+		The /sys/class/extcon/.../cable.x/name shows and stores the
 		state of cable "x" (integer between 0 and 31) of an extcon
 		device. The state value is either 0 (detached) or 1
 		(attached).
@@ -83,8 +83,8 @@ Date:		December 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
 		Shows the relations of mutually exclusiveness. For example,
-		if the mutually_exclusive array of extcon device is
-		{0x3, 0x5, 0xC, 0x0}, then the output is:
+		if the mutually_exclusive array of extcon_dev is
+		{0x3, 0x5, 0xC, 0x0}, the, the output is:
 		# ls mutually_exclusive/
 		0x3
 		0x5

trunk/Documentation/ABI/testing/sysfs-class-regulator

@@ -349,24 +349,3 @@ Description:
 
 		This will be one of the same strings reported by
 		the "state" attribute.
-
-What:		/sys/class/regulator/.../bypass
-Date:		September 2012
-KernelVersion:	3.7
-Contact:	Mark Brown <broonie@opensource.wolfsonmicro.com>
-Description:
-		Some regulator directories will contain a field called
-		bypass.  This indicates if the device is in bypass mode.
-
-		This will be one of the following strings:
-
-		'enabled'
-		'disabled'
-		'unknown'
-
-		'enabled' means the regulator is in bypass mode.
-
-		'disabled' means that the regulator is regulating.
-
-		'unknown' means software cannot determine the state, or
-		the reported state is invalid.

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-driver-wacom

@@ -1,16 +1,3 @@
-WWhat:		/sys/class/hidraw/hidraw*/device/oled*_img
-Date:		June 2012
-Contact:	linux-bluetooth@vger.kernel.org
-Description:
-		The /sys/class/hidraw/hidraw*/device/oled*_img files control
-		OLED mocro displays on Intuos4 Wireless tablet. Accepted image
-		has to contain 256 bytes (64x32 px 1 bit colour). The format
-		is the same as PBM image 62x32px without header (64 bits per
-		horizontal line, 32 lines). An example of setting OLED No. 0:
-		dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img
-		The attribute is read only and no local copy of the image is
-		stored.
-
 What:		/sys/class/hidraw/hidraw*/device/speed
 Date:		April 2010
 Kernel Version:	2.6.35

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/ABI/testing/sysfs-ptp

@@ -19,11 +19,7 @@ Date:		September 2010
 Contact:	Richard Cochran <richardcochran@gmail.com>
 Description:
 		This file contains the name of the PTP hardware clock
-		as a human readable string. The purpose of this
-		attribute is to provide the user with a "friendly
-		name" and to help distinguish PHY based devices from
-		MAC based ones. The string does not necessarily have
-		to be any kind of unique id.
+		as a human readable string.
 
 What:		/sys/class/ptp/ptpN/max_adjustment
 Date:		September 2010

trunk/Documentation/ABI/testing/sysfs-tty

@@ -17,12 +17,3 @@ Description:
 		 device, like 'tty1'.
 		 The file supports poll() to detect virtual
 		 console switches.
-
-What:		/sys/class/tty/ttyS0/uartclk
-Date:		Sep 2012
-Contact:	Tomas Hlavacek <tmshlvck@gmail.com>
-Description:
-		 Shows the current uartclk value associated with the
-		 UART port in serial_core, that is bound to TTY like ttyS0.
-		 uartclk = 16 * baud_base
-

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