Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4f9f2b6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v3.0-rc3' into perf/core 



Merge reason: add the latest fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 76369139 2c53b436

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -518,6 +518,14 @@ N: Zach Brown 
E: zab@zabbo.net

D: maestro pci sound



M: David Brownell

D: Kernel engineer, mentor, and friend.  Maintained USB EHCI and

D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few

D: device drivers.  His encouragement also helped many engineers get

D: started working on the Linux kernel.  David passed away in early

D: 2011, and will be greatly missed.

W: https://lkml.org/lkml/2011/4/5/36



N: Gary Brubaker

E: xavyer@ix.netcom.com

D: USB Serial Empeg Empeg-car Mark I/II Driver

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -2598,6 +2598,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					unlock ejectable media);

				m = MAX_SECTORS_64 (don't transfer more

					than 64 sectors = 32 KB at a time);

				n = INITIAL_READ10 (force a retry of the

					initial READ(10) command);

				o = CAPACITY_OK (accept the capacity

					reported by the device);

				r = IGNORE_RESIDUE (the device reports

MAINTAINERS

+7 −10
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ S: Supported 
F:	drivers/net/enic/



CIRRUS LOGIC EP93XX ETHERNET DRIVER

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Hartley Sweeten <hsweeten@visionengravers.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/arm/ep93xx_eth.c
@@ -4252,8 +4252,7 @@ F: drivers/mmc/ 
F:	include/linux/mmc/



MULTIMEDIA CARD (MMC) ETC. OVER SPI

M:	David Brownell <dbrownell@users.sourceforge.net>

S:	Odd Fixes

S:	Orphan

F:	drivers/mmc/host/mmc_spi.c

F:	include/linux/spi/mmc_spi.h
@@ -4603,7 +4602,6 @@ F: drivers/media/video/omap3isp/* 


OMAP USB SUPPORT

M:	Felipe Balbi <balbi@ti.com>

M:	David Brownell <dbrownell@users.sourceforge.net>

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@ -4947,6 +4945,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi 
F:	drivers/input/serio/i8042-unicore32io.h

F:	drivers/i2c/busses/i2c-puv3.c

F:	drivers/video/fb-puv3.c

F:	drivers/rtc/rtc-puv3.c



PMC SIERRA MaxRAID DRIVER

M:	Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
@@ -5984,7 +5983,6 @@ F: Documentation/serial/specialix.txt 
F:	drivers/staging/tty/specialix*



SPI SUBSYSTEM

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/
@@ -6432,9 +6430,8 @@ S: Maintained 
F:	drivers/usb/misc/rio500*



USB EHCI DRIVER

M:	David Brownell <dbrownell@users.sourceforge.net>

L:	linux-usb@vger.kernel.org

S:	Odd Fixes

S:	Orphan

F:	Documentation/usb/ehci.txt

F:	drivers/usb/host/ehci*
@@ -6448,9 +6445,10 @@ S: Maintained 
F:	drivers/media/video/et61x251/



USB GADGET/PERIPHERAL SUBSYSTEM

M:	David Brownell <dbrownell@users.sourceforge.net>

M:	Felipe Balbi <balbi@ti.com>

L:	linux-usb@vger.kernel.org

W:	http://www.linux-usb.org/gadget

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

F:	drivers/usb/gadget/

F:	include/linux/usb/gadget*
@@ -6492,9 +6490,8 @@ S: Maintained 
F:	sound/usb/midi.*



USB OHCI DRIVER

M:	David Brownell <dbrownell@users.sourceforge.net>

L:	linux-usb@vger.kernel.org

S:	Odd Fixes

S:	Orphan

F:	Documentation/usb/ohci.txt

F:	drivers/usb/host/ohci*

Makefile

+4 −14
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc3

NAME = Sneaky Weasel



# *DOCUMENTATION*
@@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds 


# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)



export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
@@ -1005,7 +1005,7 @@ endef 


define filechk_version.h

	(echo \#define LINUX_VERSION_CODE $(shell                             \

	expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL));     \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL));    \

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

endef
@@ -1110,11 +1110,6 @@ modules_install: _modinst_ _modinst_post 


PHONY += _modinst_

_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";\

		sleep 1; \

	fi

	@rm -rf $(MODLIB)/kernel

	@rm -f $(MODLIB)/source

	@mkdir -p $(MODLIB)/kernel
@@ -1531,12 +1526,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 


# Run depmod only if we have System.map and depmod is executable

quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)

      cmd_depmod = \

	if [ -r System.map -a -x $(DEPMOD) ]; then                              \

		$(DEPMOD) -ae -F System.map                                     \

		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) )     \

		$(KERNELRELEASE);                                               \

	fi

      cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)



# Create temporary dir for module support files

# clean it up only when building all modules

arch/arm/mach-ep93xx/core.c

+5 −1
Original line number Diff line number Diff line
@@ -402,11 +402,15 @@ static struct resource ep93xx_eth_resource[] = { 
	}

};



static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);



static struct platform_device ep93xx_eth_device = {

	.name		= "ep93xx-eth",

	.id		= -1,

	.dev		= {

		.platform_data		= &ep93xx_eth_data,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.dma_mask		= &ep93xx_eth_dma_mask,

	},

	.num_resources	= ARRAY_SIZE(ep93xx_eth_resource),

	.resource	= ep93xx_eth_resource,