linux-next: manual merge of the drm-misc tree with the drm tree
diff mbox series

Message ID 20191009103830.0b75dbb5@canb.auug.org.au
State New
Headers show
Series
  • linux-next: manual merge of the drm-misc tree with the drm tree
Related show

Commit Message

Stephen Rothwell Oct. 8, 2019, 11:38 p.m. UTC
Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/i915/i915_drv.c

between commit:

  2d6f6f359fd8 ("drm/i915: add i915_driver_modeset_remove()")

from the drm tree and commit:

  f2521f7731ed ("drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Patch
diff mbox series

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 15abad5c2d62,1c4ff8b5b0a2..000000000000
--- a/drivers/gpu/drm/i915/i915_drv.c