| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 6 Jan 2016 14:43:46 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Daniel Lezcano <daniel.lezcano@...aro.org>
Subject: linux-next: manual merge of the tip tree with the h8300 tree
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@...b.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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists