Commit f384c954 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into perf/core 



Reason: Further changes conflict with upstream fixes

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 9a15a07f 5904b3b8

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

+12 −9
Original line number Diff line number Diff line
@@ -1581,7 +1581,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 +2887,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 +2985,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.*
@@ -4205,6 +4206,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
@@ -5377,6 +5379,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