Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/parisc/include/asm/Kbuild between commit 476840458128 ("parisc:
Eliminate sg_virt_addr() and private scatterlist.h") from the parisc-hd
tree and commit e494f4a463cd ("parisc: switch to using asm-generic for
seccomp.h") 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 s...@canb.auug.org.au diff --cc arch/parisc/include/asm/Kbuild index a5f037535aab,12b341d04f88..000000000000 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@@ -20,7 -20,7 +20,8 @@@ generic-y += param. generic-y += percpu.h generic-y += poll.h generic-y += preempt.h +generic-y += scatterlist.h + generic-y += seccomp.h generic-y += segment.h generic-y += topology.h generic-y += trace_clock.h
pgph4rT7sq3yJ.pgp
Description: OpenPGP digital signature
