# git rev-parse -q --verify f91e654474d413201ae578820fb63f8a811f6c4e^{commit} f91e654474d413201ae578820fb63f8a811f6c4e already have revision, skipping fetch # git checkout -q -f -B kisskb f91e654474d413201ae578820fb63f8a811f6c4e # git clean -qxdf # < git log -1 # commit f91e654474d413201ae578820fb63f8a811f6c4e # Merge: c715ebe 3dd0f18 # Author: Linus Torvalds # Date: Wed Aug 15 22:54:12 2018 -0700 # # Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull integrity updates from James Morris: # "This adds support for EVM signatures based on larger digests, contains # a new audit record AUDIT_INTEGRITY_POLICY_RULE to differentiate the # IMA policy rules from the IMA-audit messages, addresses two deadlocks # due to either loading or searching for crypto algorithms, and cleans # up the audit messages" # # * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: # EVM: fix return value check in evm_write_xattrs() # integrity: prevent deadlock during digsig verification. # evm: Allow non-SHA1 digital signatures # evm: Don't deadlock if a crypto algorithm is unavailable # integrity: silence warning when CONFIG_SECURITYFS is not enabled # ima: Differentiate auditing policy rules from "audit" actions # ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not set # ima: Use audit_log_format() rather than audit_log_string() # ima: Call audit_log_string() rather than logging it untrusted # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 f91e654474d413201ae578820fb63f8a811f6c4e # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- randconfig KCONFIG_SEED=0x56CF8F23 # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- In file included from /kisskb/src/arch/powerpc/include/asm/mmu.h:338:0, from /kisskb/src/arch/powerpc/include/asm/paca.h:22, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/mmu-book3e.h:275:2: error: #error Unsupported page size In file included from /kisskb/src/arch/powerpc/include/asm/nohash/pgtable.h:6:0, from /kisskb/src/arch/powerpc/include/asm/pgtable.h:20, from /kisskb/src/include/linux/memremap.h:7, from /kisskb/src/include/linux/mm.h:27, from /kisskb/src/include/linux/mman.h:5, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:13:2: error: #error "Page size not supported" In file included from /kisskb/src/arch/powerpc/include/asm/nohash/pgtable.h:6:0, from /kisskb/src/arch/powerpc/include/asm/pgtable.h:20, from /kisskb/src/include/linux/memremap.h:7, from /kisskb/src/include/linux/mm.h:27, from /kisskb/src/include/linux/mman.h:5, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:121:28: error: unknown type name 'pud_t' /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:126:30: error: unknown type name 'pud_t' /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:137:30: error: unknown type name 'pud_t' /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:139:29: error: unknown type name 'pud_t' /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:144:1: error: unknown type name 'pud_t' /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h: In function 'pte_pud': /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:146:2: error: implicit declaration of function '__pud' [-Werror=implicit-function-declaration] In file included from /kisskb/src/arch/powerpc/include/asm/pgtable.h:51:0, from /kisskb/src/include/linux/memremap.h:7, from /kisskb/src/include/linux/mm.h:27, from /kisskb/src/include/linux/mman.h:5, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/include/asm-generic/pgtable.h: At top level: /kisskb/src/include/asm-generic/pgtable.h:16:2: error: #error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED /kisskb/src/include/asm-generic/pgtable.h:52:29: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:53:6: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:215:1: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:217:10: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:280:34: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:395:28: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:395:41: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:524:20: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:549:41: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:871:34: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:1029:32: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:1041:34: error: unknown type name 'pud_t' /kisskb/src/include/asm-generic/pgtable.h:1049:37: error: unknown type name 'pud_t' In file included from /kisskb/src/include/linux/mman.h:5:0, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/include/linux/mm.h:351:2: error: unknown type name 'pud_t' /kisskb/src/include/linux/mm.h:483:30: error: unknown type name 'pud_t' In file included from /kisskb/src/include/linux/mm.h:498:0, from /kisskb/src/include/linux/mman.h:5, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/include/linux/huge_mm.h:15:5: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:15:21: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:21:64: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:39:4: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:52:4: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:318:47: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:334:37: error: unknown type name 'pud_t' /kisskb/src/include/linux/huge_mm.h:351:23: error: unknown type name 'pud_t' In file included from /kisskb/src/include/linux/mman.h:5:0, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/include/linux/mm.h:1370:19: error: unknown type name 'pud_t' /kisskb/src/include/linux/mm.h: In function 'mm_inc_nr_puds': /kisskb/src/include/linux/mm.h:1735:40: error: 'pud_t' undeclared (first use in this function) /kisskb/src/include/linux/mm.h:1735:40: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/include/linux/mm.h: In function 'mm_dec_nr_puds': /kisskb/src/include/linux/mm.h:1740:40: error: 'pud_t' undeclared (first use in this function) /kisskb/src/include/linux/mm.h: At top level: /kisskb/src/include/linux/mm.h:1755:39: error: unknown type name 'pud_t' /kisskb/src/include/linux/mm.h:1825:54: error: unknown type name 'pud_t' /kisskb/src/include/linux/mm.h:2011:61: error: unknown type name 'pud_t' /kisskb/src/include/linux/mm.h:2016:58: error: unknown type name 'pud_t' In file included from /kisskb/src/include/linux/mman.h:5:0, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/include/linux/mm.h:2678:1: error: unknown type name 'pud_t' /kisskb/src/include/linux/mm.h:2679:29: error: unknown type name 'pud_t' cc1: some warnings being treated as errors /kisskb/src/./Kbuild:56: recipe for target 'arch/powerpc/kernel/asm-offsets.s' failed make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1 /kisskb/src/Makefile:1091: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc # Build took: 0:00:07.722590