---

yaml
---
r: 355099
b: refs/heads/master
c: 2c33727
h: refs/heads/master
i:
  355097: c4fa9a0
  355095: 6f980a9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ed214ac2095f561a94335ca672b6c42a1ea40ff
+refs/heads/master: 2c33727a62ac07eed3ae423c209f549394c5c4e9

trunk/CREDITS

@@ -1572,12 +1572,12 @@ S: Wantage, New Jersey 07461
 S: USA
 
 N: Harald Hoyer
-E: harald@redhat.com
-W: http://www.harald-hoyer.de
+E: harald.hoyer@parzelle.de
+W: http://parzelle.de/
 D: ip_masq_quake
 D: md boot support
-S: Am Strand 5
-S: D-19063 Schwerin
+S: Hohe Strasse 30
+S: D-70176 Stuttgart
 S: Germany
 
 N: Jan Hubicka

trunk/Documentation/ABI/testing/ima_policy

@@ -18,21 +18,17 @@ Description:
 		rule format: action [condition ...]
 
 		action: measure | dont_measure | appraise | dont_appraise | audit
-		condition:= base | lsm  [option]
-			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]
-				 [fowner]]
+		condition:= base | lsm
+			base:	[[func=] [mask=] [fsmagic=] [uid=] [fowner]]
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
-			option:	[[appraise_type=]]
 
-		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
+		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK][MODULE_CHECK]
 			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
 			fsmagic:= hex value
-			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
 			uid:= decimal value
 			fowner:=decimal value
 		lsm:  	are LSM specific
-		option:	appraise_type:= [imasig]
 
 		default policy:
 			# PROC_SUPER_MAGIC

trunk/Documentation/ABI/testing/pstore

@@ -1,4 +1,4 @@
-Where:		/sys/fs/pstore/... (or /dev/pstore/...)
+Where:		/dev/pstore/...
 Date:		March 2011
 Kernel Version: 2.6.39
 Contact:	tony.luck@intel.com
@@ -11,9 +11,9 @@ Description:	Generic interface to platform dependent persistent storage.
 		of the console log is captured, but other interesting
 		data can also be saved.
 
-		# mount -t pstore -o kmsg_bytes=8000 - /sys/fs/pstore
+		# mount -t pstore -o kmsg_bytes=8000 - /dev/pstore
 
-		$ ls -l /sys/fs/pstore/
+		$ ls -l /dev/pstore
 		total 0
 		-r--r--r-- 1 root root 7896 Nov 30 15:38 dmesg-erst-1
 
@@ -27,9 +27,9 @@ Description:	Generic interface to platform dependent persistent storage.
 		the file will signal to the underlying persistent storage
 		device that it can reclaim the space for later re-use.
 
-		$ rm /sys/fs/pstore/dmesg-erst-1
+		$ rm /dev/pstore/dmesg-erst-1
 
-		The expectation is that all files in /sys/fs/pstore/
+		The expectation is that all files in /dev/pstore
 		will be saved elsewhere and erased from persistent store
 		soon after boot to free up space ready for the next
 		catastrophe.

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

@@ -227,12 +227,3 @@ Contact:	Lan Tianyu <tianyu.lan@intel.com>
 Description:
 		The /sys/bus/usb/devices/.../(hub interface)/portX
 		is usb port device's sysfs directory.
-
-What:		/sys/bus/usb/devices/.../(hub interface)/portX/connect_type
-Date:		January 2013
-Contact:	Lan Tianyu <tianyu.lan@intel.com>
-Description:
-		Some platforms provide usb port connect types through ACPI.
-		This attribute is to expose these information to user space.
-		The file will read "hotplug", "wired" and "not used" if the
-		information is available, and "unknown" otherwise.