Hi all,

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

  lib/Kconfig.debug

between commit:

  57f5677e535b ("printf: add support for printing symbolic error names")

from the printk tree and patch:

  "kernel-hacking: move DEBUG_BUGVERBOSE to 'printk and dmesg options'"

from the akpm-current 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 lib/Kconfig.debug
index 045ef7caeb49,83bb867fcb6f..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -164,15 -164,15 +164,24 @@@ config DYNAMIC_DEBU
  	  See Documentation/admin-guide/dynamic-debug-howto.rst for additional
  	  information.
  
 +config SYMBOLIC_ERRNAME
 +	bool "Support symbolic error names in printf"
 +	default y if PRINTK
 +	help
 +	  If you say Y here, the kernel's printf implementation will
 +	  be able to print symbolic error names such as ENOSPC instead
 +	  of the number 28. It makes the kernel image slightly larger
 +	  (about 3KB), but can make the kernel logs easier to read.
 +
+ config DEBUG_BUGVERBOSE
+ 	bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT
+ 	depends on BUG && (GENERIC_BUG || HAVE_DEBUG_BUGVERBOSE)
+ 	default y
+ 	help
+ 	  Say Y here to make BUG() panics output the file name and line number
+ 	  of the BUG call as well as the EIP and oops trace.  This aids
+ 	  debugging but costs about 70-100K of memory.
+ 
  endmenu # "printk and dmesg options"
  
  menu "Compile-time checks and compiler options"