---

yaml --- r: 241718 b: refs/heads/master c: 4d3fbff h: refs/heads/master v: v3
git-mirror · Mar 18, 2011 · 9c59d51 · 9c59d51
1 parent b9da5bc
commit 9c59d51
Show file tree

Hide file tree

Showing 879 changed files with 13,174 additions and 27,434 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02e2407858fd62053bf60349c0e72cd1c7a4a60e
+refs/heads/master: 4d3fbff26c8e91474e30e575c2b7476be11afd83
diff --git a/trunk/Documentation/ABI/stable/sysfs-class-backlight b/trunk/Documentation/ABI/stable/sysfs-class-backlight
@@ -34,23 +34,3 @@ Contact:	Richard Purdie <rpurdie@rpsys.net>
 Description:
 		Maximum brightness for <backlight>.
 Users:		HAL
-
-What:		/sys/class/backlight/<backlight>/type
-Date:		September 2010
-KernelVersion:	2.6.37
-Contact:	Matthew Garrett <mjg@redhat.com>
-Description:
-		The type of interface controlled by <backlight>.
-		"firmware": The driver uses a standard firmware interface
-		"platform": The driver uses a platform-specific interface
-		"raw": The driver controls hardware registers directly
-
-		In the general case, when multiple backlight
-		interfaces are available for a single device, firmware
-		control should be preferred to platform control should
-		be preferred to raw control. Using a firmware
-		interface reduces the probability of confusion with
-		the hardware and the OS independently updating the
-		backlight state. Platform interfaces are mostly a
-		holdover from pre-standardisation of firmware
-		interfaces.
diff --git a/trunk/Documentation/ABI/testing/configfs-spear-pcie-gadget b/trunk/Documentation/ABI/testing/configfs-spear-pcie-gadget
diff --git a/trunk/Documentation/ABI/testing/pstore b/trunk/Documentation/ABI/testing/pstore
@@ -1,6 +1,6 @@
 Where:		/dev/pstore/...
-Date:		March 2011
-Kernel Version: 2.6.39
+Date:		January 2011
+Kernel Version: 2.6.38
 Contact:	tony.luck@intel.com
 Description:	Generic interface to platform dependent persistent storage.
 
@@ -11,7 +11,7 @@ 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 - /dev/pstore
+		# mount -t pstore - /dev/pstore
 
 		$ ls -l /dev/pstore
 		total 0
@@ -33,9 +33,3 @@ Description:	Generic interface to platform dependent persistent storage.
 		will be saved elsewhere and erased from persistent store
 		soon after boot to free up space ready for the next
 		catastrophe.
-
-		The 'kmsg_bytes' mount option changes the target amount of
-		data saved on each oops/panic. Pstore saves (possibly
-		multiple) files based on the record size of the underlying
-		persistent storage until at least this amount is reached.
-		Default is 10 Kbytes.
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-rbd b/trunk/Documentation/ABI/testing/sysfs-bus-rbd
@@ -1,6 +1,6 @@
 What:		/sys/bus/rbd/
 Date:		November 2010
-Contact:	Yehuda Sadeh <yehuda@newdream.net>,
+Contact:	Yehuda Sadeh <yehuda@hq.newdream.net>,
 		Sage Weil <sage@newdream.net>
 Description:
 

diff --git a/trunk/Documentation/ABI/testing/sysfs-devices-mmc b/trunk/Documentation/ABI/testing/sysfs-devices-mmc
diff --git a/trunk/Documentation/ABI/testing/sysfs-fs-pstore b/trunk/Documentation/ABI/testing/sysfs-fs-pstore
@@ -0,0 +1,7 @@
+What:		/sys/fs/pstore/kmsg_bytes
+Date:		January 2011
+Kernel Version: 2.6.38
+Contact:	"Tony Luck" <tony.luck@intel.com>
+Description:
+		Controls amount of console log that will be saved
+		to persistent store on oops/panic.
diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes
@@ -35,7 +35,7 @@ o  util-linux             2.10o                   # fdformat --version
 o  module-init-tools      0.9.10                  # depmod -V
 o  e2fsprogs              1.41.4                  # e2fsck -V
 o  jfsutils               1.1.3                   # fsck.jfs -V
-o  reiserfsprogs          3.6.3                   # reiserfsck -V
+o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs
 o  xfsprogs               2.6.0                   # xfs_db -V
 o  squashfs-tools         4.0                     # mksquashfs -version
 o  btrfs-progs            0.18                    # btrfsck
@@ -46,9 +46,9 @@ o  isdn4k-utils           3.1pre1                 # isdnctrl 2>&1|grep version
 o  nfs-utils              1.0.5                   # showmount --version
 o  procps                 3.2.0                   # ps --version
 o  oprofile               0.9                     # oprofiled --version
-o  udev                   081                     # udevd --version
-o  grub                   0.93                    # grub --version || grub-install --version
-o  mcelog                 0.6                     # mcelog --version
+o  udev                   081                     # udevinfo -V
+o  grub                   0.93                    # grub --version
+o  mcelog		  0.6
 o  iptables               1.4.2                   # iptables -V
 
 

diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle
@@ -168,13 +168,6 @@ Do not unnecessarily use braces where a single statement will do.
 if (condition)
 	action();
 
-and
-
-if (condition)
-	do_this();
-else
-	do_that();
-
 This does not apply if one branch of a conditional statement is a single
 statement. Use braces in both branches.
 

diff --git a/trunk/Documentation/acpi/apei/output_format.txt b/trunk/Documentation/acpi/apei/output_format.txt
@@ -92,38 +92,13 @@ vendor_id: <integer>, device_id: <integer>
 class_code: <integer>]
 [serial number: <integer>, <integer>]
 [bridge: secondary_status: <integer>, control: <integer>]
-[aer_status: <integer>, aer_mask: <integer>
-<aer status string>
-[aer_uncor_severity: <integer>]
-aer_layer=<aer layer string>, aer_agent=<aer agent string>
-aer_tlp_header: <integer> <integer> <integer> <integer>]
 
 <pcie port type string>* := PCIe end point | legacy PCI end point | \
 unknown | unknown | root port | upstream switch port | \
 downstream switch port | PCIe to PCI/PCI-X bridge | \
 PCI/PCI-X to PCIe bridge | root complex integrated endpoint device | \
 root complex event collector
 
-if section severity is fatal or recoverable
-<aer status string># :=
-unknown | unknown | unknown | unknown | Data Link Protocol | \
-unknown | unknown | unknown | unknown | unknown | unknown | unknown | \
-Poisoned TLP | Flow Control Protocol | Completion Timeout | \
-Completer Abort | Unexpected Completion | Receiver Overflow | \
-Malformed TLP | ECRC | Unsupported Request
-else
-<aer status string># :=
-Receiver Error | unknown | unknown | unknown | unknown | unknown | \
-Bad TLP | Bad DLLP | RELAY_NUM Rollover | unknown | unknown | unknown | \
-Replay Timer Timeout | Advisory Non-Fatal
-fi
-
-<aer layer string> :=
-Physical Layer | Data Link Layer | Transaction Layer
-
-<aer agent string> :=
-Receiver ID | Requester ID | Completer ID | Transmitter ID
-
 Where, [] designate corresponding content is optional
 
 All <field string> description with * has the following format:

diff --git a/trunk/Documentation/devicetree/bindings/hwmon/ads1015.txt b/trunk/Documentation/devicetree/bindings/hwmon/ads1015.txt
diff --git a/trunk/Documentation/devicetree/bindings/open-pic.txt b/trunk/Documentation/devicetree/bindings/open-pic.txt