Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm64/include/asm/Kbuild between commit 2f06dbe4e4fc ("arm64: use
generic dma-contiguous.h") from the mips tree and commit c5c38ef3d703
("irq_work: Introduce arch_irq_work_has_interrupt()") from the tip tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc arch/arm64/include/asm/Kbuild index 55c179b32dd9,c1968475cc4e..000000000000 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild @@@ -9,9 -9,8 +9,9 @@@ generic-y += current. generic-y += delay.h generic-y += div64.h generic-y += dma.h +generic-y += dma-contiguous.h - generic-y += emergency-restart.h generic-y += early_ioremap.h + generic-y += emergency-restart.h generic-y += errno.h generic-y += ftrace.h generic-y += hash.h
signature.asc
Description: PGP signature
