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

Commit 6004f172 authored by Dave Airlie's avatar Dave Airlie
Browse files

BackMerge v4.19-rc6 into drm-next 



I have some pulls based on rc6, and I prefer to have an explicit backmerge.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 612c6bd5 17b57b18

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −1
Original line number Diff line number Diff line 
Device-Tree bindings for input/gpio_keys.c keyboard driver

Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver



Required properties:

	- compatible = "gpio-keys";

Documentation/media/uapi/dvb/video_function_calls.rst

+0 −1
Original line number Diff line number Diff line
@@ -33,4 +33,3 @@ Video Function Calls 
    video-clear-buffer

    video-set-streamtype

    video-set-format
 
    video-set-attributes

MAINTAINERS

+14 −8
Original line number Diff line number Diff line
@@ -9721,13 +9721,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ 
S:	Maintained

F:	drivers/media/dvb-frontends/mn88473*



PCI DRIVER FOR MOBIVEIL PCIE IP

M:	Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>

L:	linux-pci@vger.kernel.org

S:	Supported

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

F:	drivers/pci/controller/pcie-mobiveil.c



MODULE SUPPORT

M:	Jessica Yu <jeyu@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@ -10957,7 +10950,7 @@ M: Willy Tarreau <willy@haproxy.com> 
M:	Ksenija Stanojevic <ksenija.stanojevic@gmail.com>

S:	Odd Fixes

F:	Documentation/auxdisplay/lcd-panel-cgram.txt

F:	drivers/misc/panel.c

F:	drivers/auxdisplay/panel.c



PARALLEL PORT SUBSYSTEM

M:	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -11145,6 +11138,13 @@ F: include/uapi/linux/switchtec_ioctl.h 
F:	include/linux/switchtec.h

F:	drivers/ntb/hw/mscc/



PCI DRIVER FOR MOBIVEIL PCIE IP

M:	Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>

L:	linux-pci@vger.kernel.org

S:	Supported

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

F:	drivers/pci/controller/pcie-mobiveil.c



PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

M:	Jason Cooper <jason@lakedaemon.net>
@@ -11211,8 +11211,14 @@ F: tools/pci/ 


PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC

M:	Russell Currey <ruscur@russell.cc>

M:	Sam Bobroff <sbobroff@linux.ibm.com>

M:	Oliver O'Halloran <oohall@gmail.com>

L:	linuxppc-dev@lists.ozlabs.org

S:	Supported

F:	Documentation/PCI/pci-error-recovery.txt

F:	drivers/pci/pcie/aer.c

F:	drivers/pci/pcie/dpc.c

F:	drivers/pci/pcie/err.c

F:	Documentation/powerpc/eeh-pci-error-recovery.txt

F:	arch/powerpc/kernel/eeh*.c

F:	arch/powerpc/platforms/*/eeh*.c

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Merciless Moray



# *DOCUMENTATION*

arch/powerpc/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ extern void ppc_printk_progress(char *s, unsigned short hex); 


extern unsigned int rtas_data;

extern unsigned long long memory_limit;

extern bool init_mem_is_free;

extern unsigned long klimit;

extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);