---

yaml
---
r: 376998
b: refs/heads/master
c: 5939212
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2cc9c19e48bcf00f10c23fbf9f6abe43f6929d5
+refs/heads/master: 5939212df87e9377dd3813904264b94a962d19ca

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

@@ -66,7 +66,27 @@ current_snap
 
 	The current snapshot for which the device is mapped.
 
+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>
+-------------------------------------------------------------
+
+snap_id
+
+	The rados internal snapshot id assigned for this snapshot
+
+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-class-mtd

@@ -14,15 +14,17 @@ Description:
 		The /sys/class/mtd/mtd{0,1,2,3,...} directories correspond
 		to each /dev/mtdX character device.  These may represent
 		physical/simulated flash devices, partitions on a flash
-		device, or concatenated flash devices.
+		device, or concatenated flash devices.  They exist regardless
+		of whether CONFIG_MTD_CHAR is actually enabled.
 
 What:		/sys/class/mtd/mtdXro/
 Date:		April 2009
 KernelVersion:	2.6.29
 Contact:	linux-mtd@lists.infradead.org
 Description:
 		These directories provide the corresponding read-only device
-		nodes for /sys/class/mtd/mtdX/ .
+		nodes for /sys/class/mtd/mtdX/ .  They are only created
+		(for the benefit of udev) if CONFIG_MTD_CHAR is enabled.
 
 What:		/sys/class/mtd/mtdX/dev
 Date:		April 2009

trunk/Documentation/ABI/testing/sysfs-class-net-mesh

@@ -67,14 +67,6 @@ Description:
                 Defines the penalty which will be applied to an
                 originator message's tq-field on every hop.
 
-What:           /sys/class/net/<mesh_iface>/mesh/network_coding
-Date:           Nov 2012
-Contact:        Martin Hundeboll <martin@hundeboll.net>
-Description:
-                Controls whether Network Coding (using some magic
-                to send fewer wifi packets but still the same
-                content) is enabled or not.
-
 What:           /sys/class/net/<mesh_iface>/mesh/orig_interval
 Date:           May 2010
 Contact:        Marek Lindner <lindner_marek@yahoo.de>

trunk/Documentation/ABI/testing/sysfs-firmware-acpi

@@ -18,32 +18,6 @@ Description:
 		yoffset: The number of pixels between the top of the screen
 			 and the top edge of the image.
 
-What:		/sys/firmware/acpi/hotplug/
-Date:		February 2013
-Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Description:
-		There are separate hotplug profiles for different classes of
-		devices supported by ACPI, such as containers, memory modules,
-		processors, PCI root bridges etc.  A hotplug profile for a given
-		class of devices is a collection of settings defining the way
-		that class of devices will be handled by the ACPI core hotplug
-		code.  Those profiles are represented in sysfs as subdirectories
-		of /sys/firmware/acpi/hotplug/.
-
-		The following setting is available to user space for each
-		hotplug profile:
-
-		enabled: If set, the ACPI core will handle notifications of
-			hotplug events associated with the given class of
-			devices and will allow those devices to be ejected with
-			the help of the _EJ0 control method.  Unsetting it
-			effectively disables hotplug for the correspoinding
-			class of devices.
-
-		The value of the above attribute is an integer number: 1 (set)
-		or 0 (unset).  Attempts to write any other values to it will
-		cause -EINVAL to be returned.
-
 What:		/sys/firmware/acpi/interrupts/
 Date:		February 2008
 Contact:	Len Brown <lenb@kernel.org>

trunk/Documentation/DocBook/80211.tmpl

@@ -437,7 +437,7 @@
       </section>
 !Finclude/net/mac80211.h ieee80211_get_buffered_bc
 !Finclude/net/mac80211.h ieee80211_beacon_get
-!Finclude/net/mac80211.h ieee80211_sta_eosp
+!Finclude/net/mac80211.h ieee80211_sta_eosp_irqsafe
 !Finclude/net/mac80211.h ieee80211_frame_release_type
 !Finclude/net/mac80211.h ieee80211_sta_ps_transition
 !Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni