Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/Kconfig between commit affeafbb8477 ("arm64: Remove stray
ARCH_HAS_OPP reference") from the arm64 tree and commit 0941368c8dd9
("lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig") from the
akpm-current tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/arm64/Kconfig index 555ad3cf3f0f,7bc7b7445774..000000000000 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -1,6 -1,8 +1,7 @@@ config ARM64 def_bool y select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE - select ARCH_HAS_OPP + select ARCH_HAS_SG_CHAIN select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_USE_CMPXCHG_LOCKREF select ARCH_SUPPORTS_ATOMIC_RMW
signature.asc
Description: PGP signature
