Commit 2745529a authored by David S. Miller's avatar David S. Miller
Browse files

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



Couple conflicts resolved here:

1) In the MACB driver, a bug fix to properly initialize the
   RX tail pointer properly overlapped with some changes
   to support variable sized rings.

2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix
   overlapping with a reorganization of the driver to support
   ACPI, OF, as well as PCI variants of the chip.

3) In 'net' we had several probe error path bug fixes to the
   stmmac driver, meanwhile a lot of this code was cleaned up
   and reorganized in 'net-next'.

4) The cls_flower classifier obtained a helper function in
   'net-next' called __fl_delete() and this overlapped with
   Daniel Borkamann's bug fix to use RCU for object destruction
   in 'net'.  It also overlapped with Jiri's change to guard
   the rhashtable_remove_fast() call with a check against
   tc_skip_sw().

5) In mlx4, a revert bug fix in 'net' overlapped with some
   unrelated changes in 'net-next'.

6) In geneve, a stale header pointer after pskb_expand_head()
   bug fix in 'net' overlapped with a large reorganization of
   the same code in 'net-next'.  Since the 'net-next' code no
   longer had the bug in question, there was nothing to do
   other than to simply take the 'net-next' hunks.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab17cb1f 8dc0f265

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
			Linus

----------



M: Matt Mackal

N: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator
@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel 


N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

W: http://www.halobates.de

D: network, x86, NUMA, various hacks

S: Schwalbenstr. 96

S: 85551 Ottobrunn
@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver 
D: Synopsys Designware PCI host bridge driver



N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu

E: seasons@falcon.sch.bme.hu

E: seasons@makosteszta.sote.hu

D: Original author of software suspend



N: Jaroslav Kysela

Documentation/devicetree/bindings/net/ethernet.txt

+20 −4
Original line number Diff line number Diff line
@@ -9,10 +9,26 @@ The following properties are common to the Ethernet controllers: 
- max-speed: number, specifies maximum speed in Mbit/s supported by the device;

- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than

  the maximum frame size (there's contradiction in ePAPR).

- phy-mode: string, operation mode of the PHY interface; supported values are

  "mii", "gmii", "sgmii", "qsgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id",

  "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii", "trgmii"; this is now a

  de-facto standard property;

- phy-mode: string, operation mode of the PHY interface. This is now a de-facto

  standard property; supported values are:

  * "mii"

  * "gmii"

  * "sgmii"

  * "qsgmii"

  * "tbi"

  * "rev-mii"

  * "rmii"

  * "rgmii" (RX and TX delays are added by the MAC when required)

  * "rgmii-id" (RGMII with internal RX and TX delays provided by the PHY, the

     MAC should not add the RX or TX delays in this case)

  * "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC

     should not add an RX delay in this case)

  * "rgmii-txid" (RGMII with internal TX delay provided by the PHY, the MAC

     should not add an TX delay in this case)

  * "rtbi"

  * "smii"

  * "xgmii"

  * "trgmii"

- phy-connection-type: the same as "phy-mode" property but described in ePAPR;

- phy-handle: phandle, specifies a reference to a node representing a PHY

  device; this property is described in ePAPR and so preferred;

Documentation/networking/nf_conntrack-sysctl.txt

+5 −2
Original line number Diff line number Diff line
@@ -62,10 +62,13 @@ nf_conntrack_generic_timeout - INTEGER (seconds) 
	protocols.



nf_conntrack_helper - BOOLEAN

	0 - disabled

	not 0 - enabled (default)

	0 - disabled (default)

	not 0 - enabled



	Enable automatic conntrack helper assignment.

	If disabled it is required to set up iptables rules to assign

	helpers to connections.  See the CT target description in the

	iptables-extensions(8) man page for further information.



nf_conntrack_icmp_timeout - INTEGER (seconds)

	default 30

MAINTAINERS

+4 −9
Original line number Diff line number Diff line
@@ -9260,11 +9260,12 @@ S: Maintained 
F:	drivers/pci/host/*layerscape*



PCI DRIVER FOR IMX6

M:	Richard Zhu <Richard.Zhu@freescale.com>

M:	Richard Zhu <hongxing.zhu@nxp.com>

M:	Lucas Stach <l.stach@pengutronix.de>

L:	linux-pci@vger.kernel.org

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

S:	Maintained

F:	Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt

F:	drivers/pci/host/*imx6*



PCI DRIVER FOR TI KEYSTONE
@@ -9323,17 +9324,11 @@ F: drivers/pci/host/pci-exynos.c 


PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jingoohan1@gmail.com>

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*designware*



PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE

M:	Jose Abreu <Jose.Abreu@synopsys.com>

M:	Joao Pinto <Joao.Pinto@synopsys.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/designware-pcie.txt

F:	drivers/pci/host/pcie-designware-plat.c

F:	drivers/pci/host/*designware*



PCI DRIVER FOR GENERIC OF HOSTS

M:	Will Deacon <will.deacon@arm.com>

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*
@@ -1019,8 +1019,6 @@ prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic 
prepare1: prepare2 $(version_h) include/generated/utsrelease.h \

                   include/config/auto.conf

	$(cmd_crmodverdir)

	$(Q)test -e include/generated/autoksyms.h || \

	    touch   include/generated/autoksyms.h



archprepare: archheaders archscripts prepare1 scripts_basic

CRA Git | Maintained and supported by SUSTech CRA and CCSE