From: Linus Torvalds Date: Fri, 7 Jul 2017 21:09:24 +0000 (-0700) Subject: Merge tag 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... X-Git-Tag: v4.13-rc1~108 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=58f051fc9828709e6c55803510761413d92c4e57;p=linux-2.6-block.git Merge tag 'kbuild-v4.13' of git://git./linux/kernel/git/masahiroy/linux-kbuild Pull Kbuild updates from Masahiro Yamada: - Clean up Makefiles and scripts - Improve clang support - Remove unneeded genhdr-y syntax - Remove unneeded cc-option-align macro - Introduce __cc-option macro and use it to fix x86 boot code compiler flags * tag 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: improve comments on KBUILD_SRC x86/build: Specify stack alignment for clang x86/build: Use __cc-option for boot code compiler options kbuild: Add __cc-option macro kbuild: remove cc-option-align kbuild: replace genhdr-y with generated-y kbuild: clang: Disable 'address-of-packed-member' warning kbuild: remove duplicated arch/*/include/generated/uapi include path kbuild: speed up checksyscalls.sh kbuild: simplify silent build (-s) detection --- 58f051fc9828709e6c55803510761413d92c4e57 diff --cc arch/arm/include/uapi/asm/Kbuild index e9b098d6b766,424935e4515d..5fb3368e70cb --- a/arch/arm/include/uapi/asm/Kbuild +++ b/arch/arm/include/uapi/asm/Kbuild @@@ -1,8 -1,6 +1,8 @@@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - genhdr-y += unistd-common.h - genhdr-y += unistd-oabi.h - genhdr-y += unistd-eabi.h + generated-y += unistd-common.h + generated-y += unistd-oabi.h + generated-y += unistd-eabi.h + +generic-y += siginfo.h