# git rev-parse -q --verify 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe^{commit} 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe already have revision, skipping fetch # git checkout -q -f -B kisskb 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe # git clean -qxdf # < git log -1 # commit 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe # Merge: 3bb37da 863c37f # Author: Linus Torvalds # Date: Mon Aug 13 22:34:47 2018 -0700 # # Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 # # Pull ext4 updates from Ted Ts'o: # # - Convert content from the ext4 wiki to Documentation rst files so it # is more likely to be updated as we add new features to ext4. # # - Add 64-bit timestamp support to ext4's superblock fields. # # - ... and the usual bug fixes and cleanups, including a Spectre gadget # fixup and some hardening against maliciously corrupted file systems. # # * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (34 commits) # ext4: remove unneeded variable "err" in ext4_mb_release_inode_pa() # ext4: improve code readability in ext4_iget() # ext4: fix spectre gadget in ext4_mb_regular_allocator() # ext4: check for NUL characters in extended attribute's name # ext4: use ext4_warning() for sb_getblk failure # ext4: fix race when setting the bitmap corrupted flag # ext4: reset error code in ext4_find_entry in fallback # ext4: handle layout changes to pinned DAX mappings # dax: dax_layout_busy_page() warn on !exceptional # docs: fix up the obviously obsolete bits in the new ext4 documentation # docs: add new ext4 superblock time extension fields # docs: create filesystem internal section # ext4: use swap macro in mext_page_double_lock # ext4: check allocation failure when duplicating "data" in ext4_remount() # ext4: fix warning message in ext4_enable_quotas() # ext4: super: extend timestamps to 40 bits # jbd2: replace current_kernel_time64 with ktime equivalent # ext4: use timespec64 for all inode times # ext4: use ktime_get_real_seconds for i_dtime # ext4: use 64-bit timestamps for mmp_time # ... # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig KCONFIG_SEED=0x7C1CDC1C # 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-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:3709:warning: override: CPU_BIG_ENDIAN changes choice state # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-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 #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" #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' static inline void pud_set(pud_t *pudp, unsigned long val) ^ /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:126:30: error: unknown type name 'pud_t' static inline void pud_clear(pud_t *pudp) ^ /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:137:30: error: unknown type name 'pud_t' extern struct page *pud_page(pud_t pud); ^ /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:139:29: error: unknown type name 'pud_t' static inline pte_t pud_pte(pud_t pud) ^ /kisskb/src/arch/powerpc/include/asm/nohash/64/pgtable.h:144:15: error: unknown type name 'pud_t' static inline pud_t pte_pud(pte_t pte) ^ /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:9: error: implicit declaration of function '__pud' [-Werror=implicit-function-declaration] return __pud(pte_val(pte)); ^ 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 #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' unsigned long address, pud_t *pudp, ^ /kisskb/src/include/asm-generic/pgtable.h:53:6: error: unknown type name 'pud_t' pud_t entry, int dirty) ^ /kisskb/src/include/asm-generic/pgtable.h:215:8: error: unknown type name 'pud_t' extern pud_t pudp_huge_clear_flush(struct vm_area_struct *vma, ^ /kisskb/src/include/asm-generic/pgtable.h:217:10: error: unknown type name 'pud_t' pud_t *pudp); ^ /kisskb/src/include/asm-generic/pgtable.h:280:34: error: unknown type name 'pud_t' unsigned long address, pud_t *pudp) ^ /kisskb/src/include/asm-generic/pgtable.h:395:28: error: unknown type name 'pud_t' static inline int pud_same(pud_t pud_a, pud_t pud_b) ^ /kisskb/src/include/asm-generic/pgtable.h:395:41: error: unknown type name 'pud_t' static inline int pud_same(pud_t pud_a, pud_t pud_b) ^ /kisskb/src/include/asm-generic/pgtable.h:524:20: error: unknown type name 'pud_t' void pud_clear_bad(pud_t *); ^ /kisskb/src/include/asm-generic/pgtable.h:549:41: error: unknown type name 'pud_t' static inline int pud_none_or_clear_bad(pud_t *pud) ^ /kisskb/src/include/asm-generic/pgtable.h:871:34: error: unknown type name 'pud_t' static inline int pud_trans_huge(pud_t pud) ^ /kisskb/src/include/asm-generic/pgtable.h:1029:32: error: unknown type name 'pud_t' static inline int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) ^ /kisskb/src/include/asm-generic/pgtable.h:1041:34: error: unknown type name 'pud_t' static inline int pud_clear_huge(pud_t *pud) ^ /kisskb/src/include/asm-generic/pgtable.h:1049:37: error: unknown type name 'pud_t' static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) ^ 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' pud_t *pud; /* Pointer to pud entry matching ^ /kisskb/src/include/linux/mm.h:483:30: error: unknown type name 'pud_t' static inline int pud_devmap(pud_t pud) ^ 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' pud_t *dst_pud, pud_t *src_pud, unsigned long addr, ^ /kisskb/src/include/linux/huge_mm.h:15:21: error: unknown type name 'pud_t' pud_t *dst_pud, pud_t *src_pud, unsigned long addr, ^ /kisskb/src/include/linux/huge_mm.h:21:64: error: unknown type name 'pud_t' static inline void huge_pud_set_accessed(struct vm_fault *vmf, pud_t orig_pud) ^ /kisskb/src/include/linux/huge_mm.h:39:4: error: unknown type name 'pud_t' pud_t *pud, unsigned long addr); ^ /kisskb/src/include/linux/huge_mm.h:52:4: error: unknown type name 'pud_t' pud_t *pud, pfn_t pfn, bool write); ^ /kisskb/src/include/linux/huge_mm.h:318:47: error: unknown type name 'pud_t' static inline spinlock_t *pud_trans_huge_lock(pud_t *pud, ^ /kisskb/src/include/linux/huge_mm.h:334:37: error: unknown type name 'pud_t' static inline bool is_huge_zero_pud(pud_t pud) ^ /kisskb/src/include/linux/huge_mm.h:351:23: error: unknown type name 'pud_t' unsigned long addr, pud_t *pud, int flags) ^ 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' int (*pud_entry)(pud_t *pud, unsigned long addr, ^ /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) atomic_long_add(PTRS_PER_PUD * sizeof(pud_t), &mm->pgtables_bytes); ^ /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) atomic_long_sub(PTRS_PER_PUD * sizeof(pud_t), &mm->pgtables_bytes); ^ /kisskb/src/include/linux/mm.h: At top level: /kisskb/src/include/linux/mm.h:1755:39: error: unknown type name 'pud_t' int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address); ^ /kisskb/src/include/linux/mm.h:1825:54: error: unknown type name 'pud_t' static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) ^ /kisskb/src/include/linux/mm.h:2011:61: error: unknown type name 'pud_t' static inline spinlock_t *pud_lockptr(struct mm_struct *mm, pud_t *pud) ^ /kisskb/src/include/linux/mm.h:2016:58: error: unknown type name 'pud_t' static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) ^ 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' pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); ^ /kisskb/src/include/linux/mm.h:2679:29: error: unknown type name 'pud_t' pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); ^ 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:1081: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... 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-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-5.3 # Build took: 0:00:07.990875