git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Maxime Ripard <maxime.ripard@bootlin.com>
	Mon, 22 Jul 2019 19:24:10 +0000 (21:24 +0200)
committer	Maxime Ripard <maxime.ripard@bootlin.com>
	Mon, 22 Jul 2019 19:24:10 +0000 (21:24 +0200)
commit	03b0f2ce735e97e9f49790d4563c82515b8fa702
tree	da561805bffd06bfba81c867f83cacb28f3a64e5	tree
parent	e4f86e43716443e934d705952902d40de0fa9a05	commit \| diff
parent	5f9e832c137075045d15cd6899ab0505cfb2ca4b	commit \| diff

Merge v5.3-rc1 into drm-misc-next

Noralf needs some SPI patches in 5.3 to merge some work on tinydrm.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

74 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/malidp_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/armada/armada_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/armada/armada_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/armada/armada_gem.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioc32.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_modes.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/ipuv3-crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_atomic.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_abi16.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_gem.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panfrost/panfrost_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panfrost/panfrost_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/pl111/pl111_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/rockchip/cdn-dp-core.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/gem.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_external.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_hvs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_v3d.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_vq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_tvenc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_vga.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_vou.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/display/komeda/komeda_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/arm/malidp_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/armada/armada_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/armada/armada_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/armada/armada_gem.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bochs/bochs_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioc32.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_modes.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/ipuv3-crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/ipuv3-plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_atomic.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_abi16.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_gem.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/omap_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panfrost/panfrost_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panfrost/panfrost_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/pl111/pl111_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/rockchip/cdn-dp-core.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/gem.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_external.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_hvs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_v3d.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/virtio/virtgpu_vq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_tvenc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_vga.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/zte/zx_vou.c	diff1 \|	diff2 \|	blob \| history