Merge branch 'master' into for-linus (a2262d8a) · Commits · e / devices / android_kernel_xiaomi_markw

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

+35 −17

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/
		@@ -2109,11 +2111,18 @@ F: drivers/edac/i5000_edac.c

		EDAC-I5400
		M: Mauro Carvalho Chehab <mchehab@redhat.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i5400_edac.c

		EDAC-I7CORE
		M: Mauro Carvalho Chehab <mchehab@redhat.com>
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c

		EDAC-I82975X
		M: Ranganathan Desikan <ravi@jetztechnologies.com>
		M: "Arvind R." <arvind@jetztechnologies.com>
		@@ -2887,6 +2896,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,20 +2994,14 @@ F: drivers/net/ixgb/
		F: drivers/net/ixgbe/

		INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
		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: 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.*

		@@ -3379,7 +3389,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
		@@ -4212,6 +4222,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
		@@ -4626,6 +4637,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
		@@ -5384,6 +5401,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

+2 −72

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

		# DOCUMENTATION
		@@ -883,80 +883,10 @@ PHONY += $(vmlinux-dirs)
		$(vmlinux-dirs): prepare scripts
		$(Q)$(MAKE) $(build)=$@

		# Build the kernel release string
		#
		# The KERNELRELEASE value built here is stored in the file
		# include/config/kernel.release, and is used when executing several
		# make targets, such as "make install" or "make modules_install."
		#
		# The eventual kernel release string consists of the following fields,
		# shown in a hierarchical format to show how smaller parts are concatenated
		# to form the larger and final value, with values coming from places like
		# the Makefile, kernel config options, make command line options and/or
		# SCM tag information.
		#
		# $(KERNELVERSION)
		# $(VERSION) eg, 2
		# $(PATCHLEVEL) eg, 6
		# $(SUBLEVEL) eg, 18
		# $(EXTRAVERSION) eg, -rc6
		# $(localver-full)
		# $(localver)
		# localversion* (files without backups, containing '~')
		# $(CONFIG_LOCALVERSION) (from kernel config setting)
		# $(LOCALVERSION) (from make command line, if provided)
		# $(localver-extra)
		# $(scm-identifier) (unique SCM tag, if one exists)
		# ./scripts/setlocalversion (only with CONFIG_LOCALVERSION_AUTO)
		# .scmversion (only with CONFIG_LOCALVERSION_AUTO)
		# + (only without CONFIG_LOCALVERSION_AUTO
		# and without LOCALVERSION= and
		# repository is at non-tagged commit)
		#
		# For kernels without CONFIG_LOCALVERSION_AUTO compiled from an SCM that has
		# been revised beyond a tagged commit, `+' is appended to the version string
		# when not overridden by using "make LOCALVERSION=". This indicates that the
		# kernel is not a vanilla release version and has been modified.

		pattern = "./localversion[^~]"
		string = $(shell cat /dev/null \
		`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) \| sort -u`)

		localver = $(subst $(space),, $(string) \
		$(patsubst "%",%,$(CONFIG_LOCALVERSION)))

		# scripts/setlocalversion is called to create a unique identifier if the source
		# is managed by a known SCM and the repository has been revised since the last
		# tagged (release) commit. The format of the identifier is determined by the
		# SCM's implementation.
		#
		# .scmversion is used when generating rpm packages so we do not loose
		# the version information from the SCM when we do the build of the kernel
		# from the copied source
		ifeq ($(wildcard .scmversion),)
		scm-identifier = $(shell $(CONFIG_SHELL) \
		$(srctree)/scripts/setlocalversion $(srctree))
		else
		scm-identifier = $(shell cat .scmversion 2> /dev/null)
		endif

		ifdef CONFIG_LOCALVERSION_AUTO
		localver-extra = $(scm-identifier)
		else
		ifneq ($(scm-identifier),)
		ifeq ($(LOCALVERSION),)
		localver-extra = +
		endif
		endif
		endif

		localver-full = $(localver)$(LOCALVERSION)$(localver-extra)

		# Store (new) KERNELRELASE string in include/config/kernel.release
		kernelrelease = $(KERNELVERSION)$(localver-full)
		include/config/kernel.release: include/config/auto.conf FORCE
		$(Q)rm -f $@
		$(Q)echo $(kernelrelease) > $@
		$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@


		# Things we need to do before we recursively start building the kernel

arch/alpha/include/asm/bitops.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@ static inline unsigned long __arch_hweight64(unsigned long w)
		return __kernel_ctpop(w);
		}

		static inline unsigned int __arch_weight32(unsigned int w)
		static inline unsigned int __arch_hweight32(unsigned int w)
		{
		return __arch_hweight64(w);
		}