From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ley Foon Tan <lftan@altera•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>,
Masahiro Yamada <yamada.masahiro@socionext•com>,
Tobias Klauser <tklauser@distanz•ch>
Subject: linux-next: manual merge of the nios2 tree with Linus' tree
Date: Fri, 24 Aug 2018 09:18:43 +1000 [thread overview]
Message-ID: <20180824091843.66cdda06@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-08-23 23:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180824091843.66cdda06@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=lftan@altera$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tklauser@distanz$(echo .)ch \
--cc=yamada.masahiro@socionext$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox