Commit 856ee92e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v4.11-rc7' into drm-next 

Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
parents a6a5c983 4f7d029b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ Linas Vepstas <linas@austin.ibm.com> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Mark Brown <broonie@sirena.org.uk>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13331,7 +13331,7 @@ F: drivers/virtio/ 
F:	tools/virtio/

F:	drivers/net/virtio_net.c

F:	drivers/block/virtio_blk.c

F:	include/linux/virtio_*.h

F:	include/linux/virtio*.h

F:	include/uapi/linux/virtio_*.h

F:	drivers/crypto/virtio/

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arm/boot/dts/am335x-baltos.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ 


	phy1: ethernet-phy@1 {

		reg = <7>;

		eee-broken-100tx;

		eee-broken-1000t;

	};

};

arch/arm/boot/dts/am335x-evmsk.dts

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ 
	ti,non-removable;

	bus-width = <4>;

	cap-power-off-card;

	keep-power-in-suspend;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;