---

yaml
---
r: 329213
b: refs/heads/master
c: 19218e4
h: refs/heads/master
i:
  329211: c88bc70
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a54dfb1a845c38a97686268d8c4086a63d9493aa
+refs/heads/master: 19218e482d3f023166b26143c1a1c6d166a30415

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