From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Yoshinori Sato <ysato@users•sourceforge.jp>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Daniel Lezcano <daniel.lezcano@linaro•org>
Subject: linux-next: manual merge of the tip tree with the h8300 tree
Date: Wed, 6 Jan 2016 14:43:46 +1100 [thread overview]
Message-ID: <20160106144346.199bdc3c@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/h8300/Kconfig
between commit:
ff2b670fcb7b ("h8300: KGDB support")
from the h8300 tree and commit:
97a23beb8db9 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/h8300/Kconfig
index dc99ee1a86cf,2e20333cbce9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -17,8 -17,7 +17,9 @@@ config H830
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
select CLKSRC_OF
+ select HAVE_ARCH_KGDB
+ select HAVE_KERNEL_LZO
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
reply other threads:[~2016-01-06 3:43 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=20160106144346.199bdc3c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=ysato@users$(echo .)sourceforge.jp \
/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