Commit 0a54cec0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/rcu 



Conflicts:
	fs/fs-writeback.c

Merge reason: Resolve the conflict

Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits of:

  b97181f2: fs: remove all rcu head initializations, except on_stack initializations

As the upstream changes to this file changed this code heavily and the
first attempt to resolve the conflict resulted in a non-booting kernel.
It's safer to re-try this portion of the commit cleanly.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ec8c27e0 980019d7

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.

MAINTAINERS

+27 −16
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,20 +2987,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 +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
@@ -4212,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
@@ -4626,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
@@ -5384,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

+1 −1
Original line number Diff line number Diff line
@@ -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

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);

}

arch/alpha/kernel/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ endif 


obj-y	 += irq_pyxis.o irq_i8259.o irq_srm.o

obj-y	 += err_ev6.o

obj-y	 += es1888.o smc37c669.o smc37c93x.o ns87312.o gct.o

obj-y	 += es1888.o smc37c669.o smc37c93x.o pc873xx.o gct.o

obj-y    += srmcons.o



else
@@ -63,11 +63,11 @@ obj-$(CONFIG_ALPHA_WILDFIRE) += core_wildfire.o 
# Board support

obj-$(CONFIG_ALPHA_ALCOR)	+= sys_alcor.o irq_i8259.o irq_srm.o

obj-$(CONFIG_ALPHA_CABRIOLET)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

				   ns87312.o

				   pc873xx.o

obj-$(CONFIG_ALPHA_EB164)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

				   ns87312.o

				   pc873xx.o

obj-$(CONFIG_ALPHA_EB66P)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

				   ns87312.o

				   pc873xx.o

obj-$(CONFIG_ALPHA_LX164)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

				   smc37c93x.o

obj-$(CONFIG_ALPHA_PC164)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \
@@ -90,14 +90,14 @@ obj-$(CONFIG_ALPHA_RUFFIAN) += sys_ruffian.o irq_pyxis.o irq_i8259.o 
obj-$(CONFIG_ALPHA_RX164)	+= sys_rx164.o irq_i8259.o

obj-$(CONFIG_ALPHA_SABLE)	+= sys_sable.o

obj-$(CONFIG_ALPHA_LYNX)	+= sys_sable.o

obj-$(CONFIG_ALPHA_BOOK1)	+= sys_sio.o irq_i8259.o irq_srm.o ns87312.o

obj-$(CONFIG_ALPHA_AVANTI)	+= sys_sio.o irq_i8259.o irq_srm.o ns87312.o

obj-$(CONFIG_ALPHA_NONAME)	+= sys_sio.o irq_i8259.o irq_srm.o ns87312.o

obj-$(CONFIG_ALPHA_P2K)		+= sys_sio.o irq_i8259.o irq_srm.o ns87312.o

obj-$(CONFIG_ALPHA_XL)		+= sys_sio.o irq_i8259.o irq_srm.o ns87312.o

obj-$(CONFIG_ALPHA_BOOK1)	+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_AVANTI)	+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_NONAME)	+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_P2K)		+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_XL)		+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_SX164)	+= sys_sx164.o irq_pyxis.o irq_i8259.o \

				   irq_srm.o smc37c669.o

obj-$(CONFIG_ALPHA_TAKARA)	+= sys_takara.o irq_i8259.o ns87312.o

obj-$(CONFIG_ALPHA_TAKARA)	+= sys_takara.o irq_i8259.o pc873xx.o

obj-$(CONFIG_ALPHA_WILDFIRE)	+= sys_wildfire.o irq_i8259.o



# Error support

CRA Git | Maintained and supported by SUSTech CRA and CCSE