Commit 6e0895c2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	drivers/net/ethernet/intel/igb/igb_main.c
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
	include/net/scm.h
	net/batman-adv/routing.c
	net/ipv4/tcp_input.c

The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.

The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.

An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.

Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.

Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.

Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 55fbbe46 60d509fa

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

     <title>16x50 UART Driver</title>

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250/8250.c

!Edrivers/tty/serial/8250/8250_core.c

  </chapter>

  </chapter>





  <chapter id="fbdev">

  <chapter id="fbdev">

Documentation/kernel-parameters.txt

+26 −3
Original line number Original line Diff line number Diff line
@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			is selected automatically. Check

			is selected automatically. Check

			Documentation/kdump/kdump.txt for further details.

			Documentation/kdump/kdump.txt for further details.





	crashkernel_low=size[KMG]

			[KNL, x86] parts under 4G.



	crashkernel=range1:size1[,range2:size2,...][@offset]

	crashkernel=range1:size1[,range2:size2,...][@offset]

			[KNL] Same as above, but depends on the memory

			[KNL] Same as above, but depends on the memory

			in the running system. The syntax of range is

			in the running system. The syntax of range is
@@ -606,6 +603,26 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			a memory unit (amount[KMG]). See also

			a memory unit (amount[KMG]). See also

			Documentation/kdump/kdump.txt for an example.

			Documentation/kdump/kdump.txt for an example.





	crashkernel=size[KMG],high

			[KNL, x86_64] range could be above 4G. Allow kernel

			to allocate physical memory region from top, so could

			be above 4G if system have more than 4G ram installed.

			Otherwise memory region will be allocated below 4G, if

			available.

			It will be ignored if crashkernel=X is specified.

	crashkernel=size[KMG],low

			[KNL, x86_64] range under 4G. When crashkernel=X,high

			is passed, kernel could allocate physical memory region

			above 4G, that cause second kernel crash on system

			that require some amount of low memory, e.g. swiotlb

			requires at least 64M+32K low memory.  Kernel would

			try to allocate 72M below 4G automatically.

			This one let user to specify own low range under 4G

			for second kernel instead.

			0: to disable low allocation.

			It will be ignored when crashkernel=X,high is not used

			or memory reserved is below 4G.



	cs89x0_dma=	[HW,NET]

	cs89x0_dma=	[HW,NET]

			Format: <dma>

			Format: <dma>
@@ -788,6 +805,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	edd=		[EDD]

	edd=		[EDD]

			Format: {"off" | "on" | "skip[mbr]"}

			Format: {"off" | "on" | "skip[mbr]"}





	efi_no_storage_paranoia [EFI; X86]

			Using this parameter you can use more than 50% of

			your efi variable storage. Use this parameter only if

			you are really sure that your UEFI does sane gc and

			fulfills the spec otherwise your board may brick.



	eisa_irq_edge=	[PARISC,HW]

	eisa_irq_edge=	[PARISC,HW]

			See header of drivers/parisc/eisa.c.

			See header of drivers/parisc/eisa.c.

Documentation/scsi/LICENSE.qla2xxx

+1 −1
Original line number Original line Diff line number Diff line 
Copyright (c) 2003-2012 QLogic Corporation

Copyright (c) 2003-2013 QLogic Corporation

QLogic Linux FC-FCoE Driver

QLogic Linux FC-FCoE Driver





This program includes a device driver for Linux 3.x.

This program includes a device driver for Linux 3.x.

MAINTAINERS

+10 −4
Original line number Original line Diff line number Diff line
@@ -4941,6 +4941,12 @@ W: logfs.org 
S:	Maintained

S:	Maintained

F:	fs/logfs/

F:	fs/logfs/





LPC32XX MACHINE SUPPORT

M:	Roland Stigge <stigge@antcom.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-lpc32xx/



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
@@ -6627,7 +6633,7 @@ S: Supported 
F:	fs/reiserfs/

F:	fs/reiserfs/





REGISTER MAP ABSTRACTION

REGISTER MAP ABSTRACTION

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git

S:	Supported

S:	Supported

F:	drivers/base/regmap/

F:	drivers/base/regmap/
@@ -7375,7 +7381,7 @@ F: sound/ 




SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://alsa-project.org/main/index.php/ASoC

W:	http://alsa-project.org/main/index.php/ASoC
@@ -7464,7 +7470,7 @@ F: drivers/clk/spear/ 




SPI SUBSYSTEM

SPI SUBSYSTEM

M:	Grant Likely <grant.likely@secretlab.ca>

M:	Grant Likely <grant.likely@secretlab.ca>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@kernel.org>

L:	spi-devel-general@lists.sourceforge.net

L:	spi-devel-general@lists.sourceforge.net

Q:	http://patchwork.kernel.org/project/spi-devel-general/list/

Q:	http://patchwork.kernel.org/project/spi-devel-general/list/

T:	git git://git.secretlab.ca/git/linux-2.6.git

T:	git git://git.secretlab.ca/git/linux-2.6.git
@@ -8709,7 +8715,7 @@ F: drivers/scsi/vmw_pvscsi.h 




VOLTAGE AND CURRENT REGULATOR FRAMEWORK

VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lrg@ti.com>

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@kernel.org>

W:	http://opensource.wolfsonmicro.com/node/15

W:	http://opensource.wolfsonmicro.com/node/15

W:	http://www.slimlogic.co.uk/?p=48

W:	http://www.slimlogic.co.uk/?p=48

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git

Makefile

+3 −2
Original line number Original line Diff line number Diff line 
VERSION = 3

VERSION = 3

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc8

NAME = Unicycling Gorilla

NAME = Unicycling Gorilla





# *DOCUMENTATION*

# *DOCUMENTATION*
@@ -513,7 +513,8 @@ ifeq ($(KBUILD_EXTMOD),) 
# Carefully list dependencies so we do not try to build scripts twice

# Carefully list dependencies so we do not try to build scripts twice

# in parallel

# in parallel

PHONY += scripts

PHONY += scripts

scripts: scripts_basic include/config/auto.conf include/config/tristate.conf

scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \

	 asm-generic

	$(Q)$(MAKE) $(build)=$(@)

	$(Q)$(MAKE) $(build)=$(@)





# Objects we will link into vmlinux / subdirs we need to visit

# Objects we will link into vmlinux / subdirs we need to visit