linux-next: manual merge of the nios2 tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/nios2/Kconfig.debug

between commit:

  06ec64b84c35 ("Kconfig: consolidate the "Kernel hacking" menu")

from Linus' tree and commit:

  93bdd8902339 ("nios2: kconfig: remove duplicate DEBUG_STACK_USAGE symbol defintions")

from the nios2 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 arch/nios2/Kconfig.debug
index 7a49f0d28d14,2ee8d5144c15..000000000000
--- a/arch/nios2/Kconfig.debug
+++ b/arch/nios2/Kconfig.debug
@@@ -3,15 -4,8 +3,6 @@@
  config TRACE_IRQFLAGS_SUPPORT
  	def_bool y
  
- config DEBUG_STACK_USAGE
- 	bool "Enable stack utilization instrumentation"
- 	depends on DEBUG_KERNEL
- 	help
- 	  Enables the display of the minimum amount of free stack which each
- 	  task has ever had available in the sysrq-T and sysrq-P debug output.
- 
- 	  This option will slow down process creation somewhat.
 -source "lib/Kconfig.debug"
--
  config EARLY_PRINTK
  	bool "Activate early kernel debugging"
  	default y

Attachment: pgp5ZgpeZkOau.pgp
Description: OpenPGP digital signature