Merge branches 'sh/highmem' and 'sh/stable-updates' (12462d77) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-bus-pci

+0 −40

Original line number	Diff line number	Diff line
		@@ -133,46 +133,6 @@ Description:
		The symbolic link points to the PCI device sysfs entry of the
		Physical Function this device associates with.


		What: /sys/bus/pci/slots/...
		Date: April 2005 (possibly older)
		KernelVersion: 2.6.12 (possibly older)
		Contact: linux-pci@vger.kernel.org
		Description:
		When the appropriate driver is loaded, it will create a
		directory per claimed physical PCI slot in
		/sys/bus/pci/slots/. The names of these directories are
		specific to the driver, which in turn, are specific to the
		platform, but in general, should match the label on the
		machine's physical chassis.

		The drivers that can create slot directories include the
		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.

		The slot directories contain, at a minimum, a file named
		'address' which contains the PCI bus:device:function tuple.
		Other files may appear as well, but are specific to the
		driver.

		What: /sys/bus/pci/slots/.../function[0-7]
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		and the physical slot is actually populated with a device,
		symbolic links in the slot directory pointing to the
		device's PCI functions are created as well.

		What: /sys/bus/pci/devices/.../slot
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		a symbolic link pointing to the slot directory will be
		created as well.

		What: /sys/bus/pci/slots/.../module
		Date: June 2009
		Contact: linux-pci@vger.kernel.org

Documentation/kernel-parameters.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -2048,7 +2048,9 @@ and is between 256 and 4096 characters. It is defined in the file
		WARNING: Forcing ASPM on may cause system lockups.

		pcie_pme= [PCIE,PM] Native PCIe PME signaling options:
		off Do not use native PCIe PME signaling.
		Format: {auto\|force}[,nomsi]
		auto Use native PCIe PME signaling if the BIOS allows the
		kernel to control PCIe config registers of root ports.
		force Use native PCIe PME signaling even if the BIOS refuses
		to allow the kernel to control the relevant PCIe config
		registers.

Documentation/watchdog/watchdog-parameters.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,11 @@ ibmasr:
		nowayout: Watchdog cannot be stopped once started
		(default=kernel config parameter)
		-------------------------------------------------
		imx2_wdt:
		timeout: Watchdog timeout in seconds (default 60 s)
		nowayout: Watchdog cannot be stopped once started
		(default=kernel config parameter)
		-------------------------------------------------
		indydog:
		nowayout: Watchdog cannot be stopped once started
		(default=kernel config parameter)

MAINTAINERS

+28 −20

Original line number	Diff line number	Diff line
		@@ -896,11 +896,13 @@ S: Maintained

		ARM/SAMSUNG ARM ARCHITECTURES
		M: Ben Dooks <ben-linux@fluff.org>
		M: Kukjin Kim <kgene.kim@samsung.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		W: http://www.fluff.org/ben/linux/
		S: Maintained
		F: arch/arm/plat-s3c/
		F: arch/arm/plat-samsung/
		F: arch/arm/plat-s3c24xx/
		F: arch/arm/plat-s5p/

		ARM/S3C2410 ARM ARCHITECTURE
		M: Ben Dooks <ben-linux@fluff.org>
		@@ -1148,7 +1150,7 @@ F: drivers/mmc/host/atmel-mci.c
		F: drivers/mmc/host/atmel-mci-regs.h

		ATMEL AT91 / AT32 SERIAL DRIVER
		M: Haavard Skinnemoen <hskinnemoen@atmel.com>
		M: Nicolas Ferre <nicolas.ferre@atmel.com>
		S: Supported
		F: drivers/serial/atmel_serial.c

		@@ -1160,18 +1162,18 @@ F: drivers/video/atmel_lcdfb.c
		F: include/video/atmel_lcdc.h

		ATMEL MACB ETHERNET DRIVER
		M: Haavard Skinnemoen <hskinnemoen@atmel.com>
		M: Nicolas Ferre <nicolas.ferre@atmel.com>
		S: Supported
		F: drivers/net/macb.*

		ATMEL SPI DRIVER
		M: Haavard Skinnemoen <hskinnemoen@atmel.com>
		M: Nicolas Ferre <nicolas.ferre@atmel.com>
		S: Supported
		F: drivers/spi/atmel_spi.*

		ATMEL USBA UDC DRIVER
		M: Haavard Skinnemoen <hskinnemoen@atmel.com>
		L: kernel@avr32linux.org
		M: Nicolas Ferre <nicolas.ferre@atmel.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		W: http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
		S: Supported
		F: drivers/usb/gadget/atmel_usba_udc.*
		@@ -1581,7 +1583,7 @@ F: include/linux/coda*.h

		COMMON INTERNET FILE SYSTEM (CIFS)
		M: Steve French <sfrench@samba.org>
		L: linux-cifs-client@lists.samba.org (moderated for non-subscribers)
		L: linux-cifs@vger.kernel.org
		L: samba-technical@lists.samba.org (moderated for non-subscribers)
		W: http://linux-cifs.samba.org/
		Q: http://patchwork.ozlabs.org/project/linux-cifs-client/list/
		@@ -2887,6 +2889,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
		S: Maintained
		F: drivers/input/

		INPUT MULTITOUCH (MT) PROTOCOL
		M: Henrik Rydberg <rydberg@euromail.se>
		L: linux-input@vger.kernel.org
		S: Maintained
		F: Documentation/input/multi-touch-protocol.txt
		K: \b(ABS\|SYN)_MT_

		INTEL IDLE DRIVER
		M: Len Brown <lenb@kernel.org>
		L: linux-pm@lists.linux-foundation.org
		@@ -2978,22 +2987,14 @@ F: drivers/net/ixgb/
		F: drivers/net/ixgbe/

		INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		W: http://ipw2100.sourceforge.net
		S: Odd Fixes
		S: Orphan
		F: Documentation/networking/README.ipw2100
		F: drivers/net/wireless/ipw2x00/ipw2100.*

		INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		W: http://ipw2200.sourceforge.net
		S: Odd Fixes
		S: Orphan
		F: Documentation/networking/README.ipw2200
		F: drivers/net/wireless/ipw2x00/ipw2200.*

		@@ -3019,8 +3020,8 @@ F: drivers/net/wimax/i2400m/
		F: include/linux/wimax/i2400m.h

		INTEL WIRELESS WIFI LINK (iwlwifi)
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		W: http://intellinuxwireless.org
		@@ -3030,7 +3031,6 @@ F: drivers/net/wireless/iwlwifi/

		INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
		M: Samuel Ortiz <samuel.ortiz@intel.com>
		M: Zhu Yi <yi.zhu@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		S: Supported
		@@ -3382,7 +3382,7 @@ KPROBES
		M: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
		M: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
		M: "David S. Miller" <davem@davemloft.net>
		M: Masami Hiramatsu <mhiramat@redhat.com>
		M: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
		S: Maintained
		F: Documentation/kprobes.txt
		F: include/linux/kprobes.h
		@@ -4215,6 +4215,7 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE
		M: Grant Likely <grant.likely@secretlab.ca>
		L: devicetree-discuss@lists.ozlabs.org
		W: http://fdt.secretlab.ca
		T: git git://git.secretlab.ca/git/linux-2.6.git
		S: Maintained
		F: drivers/of
		F: include/linux/of*.h
		@@ -4629,6 +4630,12 @@ M: Robert Jarzmik <robert.jarzmik@free.fr>
		L: rtc-linux@googlegroups.com
		S: Maintained

		QLOGIC QLA1280 SCSI DRIVER
		M: Michael Reed <mdr@sgi.com>
		L: linux-scsi@vger.kernel.org
		S: Maintained
		F: drivers/scsi/qla1280.[ch]

		QLOGIC QLA2XXX FC-SCSI DRIVER
		M: Andrew Vasquez <andrew.vasquez@qlogic.com>
		M: linux-driver@qlogic.com
		@@ -5387,6 +5394,7 @@ M: David Brownell <dbrownell@users.sourceforge.net>
		M: Grant Likely <grant.likely@secretlab.ca>
		L: spi-devel-general@lists.sourceforge.net
		Q: http://patchwork.kernel.org/project/spi-devel-general/list/
		T: git git://git.secretlab.ca/git/linux-2.6.git
		S: Maintained
		F: Documentation/spi/
		F: drivers/spi/

Makefile

+4 −4

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 35
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Sheep on Meth

		# DOCUMENTATION
		@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
		localver-extra = $(scm-identifier)
		else
		ifneq ($(scm-identifier),)
		ifeq ($(LOCALVERSION),)
		ifeq ("$(origin LOCALVERSION)", "undefined")
		localver-extra = +
		endif
		endif
		@@ -1095,7 +1095,7 @@ all: modules
		# using awk while concatenating to the final file.

		PHONY += modules
		modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
		modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
		$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
		@$(kecho) ' Building modules, stage 2.';
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
		@@ -1117,7 +1117,7 @@ PHONY += modules_install
		modules_install: _modinst_ _modinst_post

		PHONY += _modinst_
		_modinst_: modules.builtin
		_modinst_:
		@if [ -z "`$(DEPMOD) -V 2>/dev/null \| grep module-init-tools`" ]; then \
		echo "Warning: you may need to install module-init-tools"; \
		echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\

Admin message