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

[Stephen Rothwell]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/Kconfig.debug
index 41c8e39a73ba,eea79125b3ea..000000000000
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@@ -1,33 -1,34 +1,33 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_I915_WERROR
-         bool "Force GCC to throw an error instead of a warning when compiling"
-         # As this may inadvertently break the build, only allow the user
-         # to shoot oneself in the foot iff they aim really hard
-         depends on EXPERT
-         # We use the dependency on !COMPILE_TEST to not be enabled in
-         # allmodconfig or allyesconfig configurations
-         depends on !COMPILE_TEST
-         default n
-         help
-           Add -Werror to the build flags for (and only for) i915.ko.
-           Do not enable this unless you are writing code for the i915.ko module.
- 
-           Recommended for driver developers only.
- 
-           If in doubt, say "N".
+ 	bool "Force GCC to throw an error instead of a warning when compiling"
+ 	# As this may inadvertently break the build, only allow the user
+ 	# to shoot oneself in the foot iff they aim really hard
+ 	depends on EXPERT
+ 	# We use the dependency on !COMPILE_TEST to not be enabled in
+ 	# allmodconfig or allyesconfig configurations
+ 	depends on !COMPILE_TEST
 -	select HEADER_TEST
+ 	default n
+ 	help
+ 	  Add -Werror to the build flags for (and only for) i915.ko.
+ 	  Do not enable this unless you are writing code for the i915.ko module.
+ 
+ 	  Recommended for driver developers only.
+ 
+ 	  If in doubt, say "N".
  
  config DRM_I915_DEBUG
-         bool "Enable additional driver debugging"
-         depends on DRM_I915
-         select DEBUG_FS
-         select PREEMPT_COUNT
-         select REFCOUNT_FULL
-         select I2C_CHARDEV
-         select STACKDEPOT
-         select DRM_DP_AUX_CHARDEV
-         select X86_MSR # used by igt/pm_rpm
-         select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
-         select DRM_DEBUG_MM if DRM=y
+ 	bool "Enable additional driver debugging"
+ 	depends on DRM_I915
+ 	select DEBUG_FS
+ 	select PREEMPT_COUNT
+ 	select REFCOUNT_FULL
+ 	select I2C_CHARDEV
+ 	select STACKDEPOT
+ 	select DRM_DP_AUX_CHARDEV
+ 	select X86_MSR # used by igt/pm_rpm
+ 	select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
+ 	select DRM_DEBUG_MM if DRM=y
  	select DRM_DEBUG_SELFTEST
  	select DMABUF_SELFTESTS
  	select SW_SYNC # signaling validation framework (igt/syncobj*)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20191118/eae7a5e5/attachment.sig>