From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
Yoshinori Sato <ysato@users•sourceforge.jp>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the clockevents tree with the h8300 tree
Date: Mon, 7 Dec 2015 16:26:42 +1100 [thread overview]
Message-ID: <20151207162642.72f5e38d@canb.auug.org.au> (raw)
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/h8300/Kconfig
between commits:
f639eeb4a60c ("h8300: enable CLKSRC_OF")
a801eb26d124 ("h8300: Add LZO compression")
from the h8300 tree and commit:
6a5c601bf048 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the clockevents 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 4e48d1224456,7a17112930a9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -16,9 -16,7 +16,10 @@@ config H830
select OF_EARLY_FLATTREE
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
+ select CLKSRC_OF
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZO
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
next reply other threads:[~2015-12-07 5:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 5:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-17 2:48 linux-next: manual merge of the clockevents tree with the h8300 tree Stephen Rothwell
2015-11-13 0:01 Stephen Rothwell
2015-11-09 23:49 Stephen Rothwell
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=20151207162642.72f5e38d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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