Commit 0654a65f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'v3.14' into drm-intel-next-queued 



Linux 3.14

The vt-d w/a merged late in 3.14-rc needs a bit of fine-tuning, hence
backmerge.

Conflicts:
	drivers/gpu/drm/i915/i915_gem_gtt.c
	drivers/gpu/drm/i915/intel_ddi.c
	drivers/gpu/drm/i915/intel_dp.c

All trivial adjacent lines changed type conflicts, so trivial git
doesn't even show them in the merg commit.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents e1f23f3d 455c6fdb

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

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ Required properties: 


Optional properties:

- local-mac-address : Ethernet mac address to use

- 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

+8 −6
Original line number Diff line number Diff line
@@ -911,11 +911,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
@@ -1832,8 +1832,8 @@ F: net/bluetooth/ 
F:	include/net/bluetooth/



BONDING DRIVER

M:	Jay Vosburgh <fubar@us.ibm.com>

M:	Veaceslav Falico <vfalico@redhat.com>

M:	Jay Vosburgh <j.vosburgh@gmail.com>

M:	Veaceslav Falico <vfalico@gmail.com>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/
@@ -2801,9 +2801,9 @@ S: Supported 
F:	drivers/acpi/dock.c



DOCUMENTATION

M:	Rob Landley <rob@landley.net>

M:	Randy Dunlap <rdunlap@infradead.org>

L:	linux-doc@vger.kernel.org

T:	TBD

T:	quilt http://www.infradead.org/~rdunlap/Doc/patches/

S:	Maintained

F:	Documentation/
@@ -4545,6 +4545,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/
@@ -6005,6 +6006,7 @@ F: include/uapi/linux/net.h 
F:	include/uapi/linux/netdevice.h

F:	tools/net/

F:	tools/testing/selftests/net/

F:	lib/random32.c



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>

Makefile

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

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE