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

Commit e515b47e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued 



Backmerge drm-next - I need to backmerge drm-intel-fixes patches
touching the error capture code to be able to merge Ben's cleanup
patches.

Conflicts:
	drivers/gpu/drm/i915/i915_gpu_error.c

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents c2c1d491 ef64cf9d

Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ of the following host1x client modules: 
    See ../reset/reset.txt for details.

  - reset-names: Must include the following entries:

    - dc

  - nvidia,head: The number of the display controller head. This is used to

    setup the various types of output to receive video data from the given

    head.



  Each display controller node has a child node, named "rgb", that represents

  the RGB output associated with the controller. It can take the following

Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Chunghwa Picture Tubes Ltd. 10.1" WXGA TFT LCD panel



Required properties:

- compatible: should be "chunghwa,claa101wa01a"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Samsung Electronics 10.1" WSVGA TFT LCD panel



Required properties:

- compatible: should be "samsung,ltn101nt05"



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -9231,6 +9231,7 @@ F: include/media/videobuf2-* 


VIRTIO CONSOLE DRIVER

M:	Amit Shah <amit.shah@redhat.com>

L:	virtio-dev@lists.oasis-open.org

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/char/virtio_console.c
@@ -9240,6 +9241,7 @@ F: include/uapi/linux/virtio_console.h 
VIRTIO CORE, NET AND BLOCK DRIVERS

M:	Rusty Russell <rusty@rustcorp.com.au>

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	virtio-dev@lists.oasis-open.org

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/virtio/
@@ -9252,6 +9254,7 @@ F: include/uapi/linux/virtio_*.h 
VIRTIO HOST (VHOST)

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	kvm@vger.kernel.org

L:	virtio-dev@lists.oasis-open.org

L:	virtualization@lists.linux-foundation.org

L:	netdev@vger.kernel.org

S:	Maintained

Makefile

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

PATCHLEVEL = 13

SUBLEVEL = 0

EXTRAVERSION = -rc8

EXTRAVERSION =

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*