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

Commit 04f58c88 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:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0fc31966 632b06aa

Documentation/devicetree/bindings/net/micrel-ks8851.txt

+3 −0
Original line number Diff line number Diff line
@@ -4,3 +4,6 @@ Required properties: 
- compatible = "micrel,ks8851-ml" of parallel interface

- reg : 2 physical address and size of registers for data and command

- interrupts : interrupt connection



Optional properties:

- vdd-supply:	supply for Ethernet mac

Documentation/networking/netlink_mmap.txt

+2 −2
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ Ring setup: 
	void *rx_ring, *tx_ring;



	/* Configure ring parameters */

	if (setsockopt(fd, NETLINK_RX_RING, &req, sizeof(req)) < 0)

	if (setsockopt(fd, SOL_NETLINK, NETLINK_RX_RING, &req, sizeof(req)) < 0)

		exit(1);

	if (setsockopt(fd, NETLINK_TX_RING, &req, sizeof(req)) < 0)

	if (setsockopt(fd, SOL_NETLINK, NETLINK_TX_RING, &req, sizeof(req)) < 0)

		exit(1)



	/* Calculate size of each individual ring */

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -918,11 +918,11 @@ F: arch/arm/include/asm/hardware/dec21285.h 
F:	arch/arm/mach-footbridge/



ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

M:	Shawn Guo <shawn.guo@linaro.org>

M:	Shawn Guo <shawn.guo@freescale.com>

M:	Sascha Hauer <kernel@pengutronix.de>

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

S:	Maintained

T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

F:	arch/arm/mach-imx/

F:	arch/arm/boot/dts/imx*

F:	arch/arm/configs/imx*_defconfig
@@ -4558,6 +4558,7 @@ M: Greg Rose <gregory.v.rose@intel.com> 
M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

M:	Mitch Williams <mitch.a.williams@intel.com>

M:	Linux NICS <linux.nics@intel.com>

L:	e1000-devel@lists.sourceforge.net

W:	http://www.intel.com/support/feedback.htm

W:	http://e1000.sourceforge.net/

Makefile

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

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc8

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

arch/arm/boot/dts/sama5d36.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
 */

#include "sama5d3.dtsi"

#include "sama5d3_can.dtsi"

#include "sama5d3_emac.dtsi"

#include "sama5d3_gmac.dtsi"

#include "sama5d3_emac.dtsi"

#include "sama5d3_lcd.dtsi"

#include "sama5d3_mci2.dtsi"

#include "sama5d3_tcb1.dtsi"