Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the akpm-current tree with the printk tree
@ 2019-10-18  6:00 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-10-18  6:00 UTC (permalink / raw)
  To: Andrew Morton, Petr Mladek
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Rasmus Villemoes, Changbin Du

[-- Attachment #1: Type: text/plain, Size: 1882 bytes --]

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"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-18  6:00 linux-next: manual merge of the akpm-current tree with the printk tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git