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

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

Commit Message

Stephen Rothwell Nov. 18, 2019, 12:17 a.m. UTC
Hi all,

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

  drivers/gpu/drm/i915/Kconfig.debug

between commit:

  fcbb8461fd23 ("kbuild: remove header compile test")

from the kbuild tree and commit:

  d30213e533fa ("drm/i915: Fix Kconfig indentation")

from the drm 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/Kconfig.debug
index 41c8e39a73ba,eea79125b3ea..000000000000
--- a/drivers/gpu/drm/i915/Kconfig.debug