Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/x86/include/asm/Kbuild between commit 10b63956fce7 ("UAPI: Plumb the
UAPI Kbuilds into the user header installation and checking") from Linus'
tree and commit e7a570ff7dff ("asm-generic: Add default clkdev.h") from
the arm-soc 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/x86/include/asm/Kbuild index 1595d68,66e5f0e..0000000 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@@ -22,3 -22,9 +22,5 @@@ header-y += sigcontext32. header-y += ucontext.h header-y += vm86.h header-y += vsyscall.h + -genhdr-y += unistd_32.h -genhdr-y += unistd_64.h -genhdr-y += unistd_x32.h - + generic-y += clkdev.h
pgp5wIov1BzU0.pgp
Description: PGP signature
