Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/microblaze/include/asm/Kbuild between commit 8cbd9cc62540
("tracing,x86: Add a TSC trace_clock") from the ftrace tree and commit
24465a40ba45 ("take sys_fork/sys_vfork/sys_clone prototypes to
linux/syscalls.h") from the signal tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/microblaze/include/asm/Kbuild
index c5d7670,88a758a..0000000
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,4 -1,6 +1,5 @@@
-include include/asm-generic/Kbuild.asm
-header-y += elf.h
generic-y += clkdev.h
generic-y += exec.h
+generic-y += trace_clock.h
+ generic-y += syscalls.h
Attachment:
pgpBuusM5Kgny.pgp
Description: PGP signature
