Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1302366 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-01-06 04:50 +0100 |
| Last post | 2016-01-06 04:50 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the tip tree with the h8300 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-06 04:50 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-01-06 04:50 +0100 |
| Subject | linux-next: manual merge of the tip tree with the h8300 tree |
| Message-ID | <qNNgK-45J-11@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web