]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolni...
authorGustavo Padovan <gustavo.padovan@collabora.com>
Thu, 28 Jun 2018 21:56:03 +0000 (18:56 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.com>
Thu, 28 Jun 2018 21:56:03 +0000 (18:56 -0300)
commit530860d88cf886fd66720807e97dbed3a6ad8a45
tree9f1513553c3136c8acd1a8bc9805cdd8aa16a483
parent6e5bfb0a5c40f98e26cd5b3f2a2814f75df60119
parentb34350a130fe53eaaf4aaa3749fd34600b633263
Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux into drm-misc-next

Immutable branch between fbdev and drm for the v4.19 merge window
(contains the deferred console takeover feature)

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
# gpg: Signature made Thu 28 Jun 2018 10:24:50 AM -03
# gpg:                using RSA key 7E33B63FA047C20B
# gpg: Can't check signature: public key not found

# Conflicts:
# drivers/gpu/drm/i915/i915_gem.c
# drivers/gpu/drm/i915/intel_crt.c
# drivers/gpu/drm/i915/intel_display.c
# drivers/gpu/drm/i915/intel_lrc.c
Link: https://patchwork.freedesktop.org/patch/msgid/2462549.rLSfW9kX99@amdc3058
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
drivers/gpu/drm/sun4i/sun4i_tcon.c