# git rev-parse -q --verify 68e77ffbfd06ae3ef8f2abf1c3b971383c866983^{commit} 68e77ffbfd06ae3ef8f2abf1c3b971383c866983 already have revision, skipping fetch # git checkout -q -f -B kisskb 68e77ffbfd06ae3ef8f2abf1c3b971383c866983 # git clean -qxdf # < git log -1 # commit 68e77ffbfd06ae3ef8f2abf1c3b971383c866983 # Merge: 7ca433dc6ded 0fddf9ad06fd # Author: Linus Torvalds # Date: Thu Jul 21 11:28:26 2022 -0700 # # Merge tag 'mtd/fixes-for-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux # # Pull MTD fix from Richard Weinberger: # "A aingle NAND controller fix: # # - gpmi: Fix busy timeout setting (wrong calculation, yes again)" # # * tag 'mtd/fixes-for-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: # mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 68e77ffbfd06ae3ef8f2abf1c3b971383c866983 # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/arch/m68k/include/asm/tlb.h:5, from /kisskb/src/arch/m68k/include/asm/motorola_pgalloc.h:5, from /kisskb/src/arch/m68k/include/asm/pgalloc.h:16, from /kisskb/src/arch/m68k/mm/init.c:26: /kisskb/src/include/asm-generic/tlb.h:401:1: error: redefinition of 'tlb_update_vma_flags' tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/tlb.h:372:1: note: previous definition of 'tlb_update_vma_flags' was here tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } ^~~~~~~~~~~~~~~~~~~~ make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/m68k/mm/init.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: arch/m68k/mm] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/m68k/include/asm/tlb.h:5, from /kisskb/src/kernel/sched/core.c:77: /kisskb/src/include/asm-generic/tlb.h:401:1: error: redefinition of 'tlb_update_vma_flags' tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/tlb.h:372:1: note: previous definition of 'tlb_update_vma_flags' was here tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } ^~~~~~~~~~~~~~~~~~~~ make[3]: *** [/kisskb/src/scripts/Makefile.build:249: kernel/sched/core.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: kernel/sched] Error 2 make[1]: *** [/kisskb/src/Makefile:1843: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/m68k/include/asm/tlb.h:5, from /kisskb/src/arch/m68k/kernel/sys_m68k.c:35: /kisskb/src/include/asm-generic/tlb.h:401:1: error: redefinition of 'tlb_update_vma_flags' tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/tlb.h:372:1: note: previous definition of 'tlb_update_vma_flags' was here tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } ^~~~~~~~~~~~~~~~~~~~ make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/m68k/kernel/sys_m68k.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/m68k/include/asm/tlb.h:5, from /kisskb/src/arch/m68k/include/asm/motorola_pgalloc.h:5, from /kisskb/src/arch/m68k/include/asm/pgalloc.h:16, from /kisskb/src/mm/filemap.c:45: /kisskb/src/include/asm-generic/tlb.h:401:1: error: redefinition of 'tlb_update_vma_flags' tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/tlb.h:372:1: note: previous definition of 'tlb_update_vma_flags' was here tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } ^~~~~~~~~~~~~~~~~~~~ make[2]: *** [/kisskb/src/scripts/Makefile.build:466: arch/m68k/kernel] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:249: mm/filemap.o] Error 1 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/m68k/include/asm/tlb.h:5, from /kisskb/src/mm/oom_kill.c:48: /kisskb/src/include/asm-generic/tlb.h:401:1: error: redefinition of 'tlb_update_vma_flags' tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/tlb.h:372:1: note: previous definition of 'tlb_update_vma_flags' was here tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } ^~~~~~~~~~~~~~~~~~~~ make[2]: *** [/kisskb/src/scripts/Makefile.build:249: mm/oom_kill.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1843: arch/m68k] Error 2 In file included from /kisskb/src/arch/m68k/include/asm/tlb.h:5, from /kisskb/src/fs/proc/task_mmu.c:25: /kisskb/src/include/asm-generic/tlb.h:401:1: error: redefinition of 'tlb_update_vma_flags' tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/tlb.h:372:1: note: previous definition of 'tlb_update_vma_flags' was here tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { } ^~~~~~~~~~~~~~~~~~~~ make[3]: *** [/kisskb/src/scripts/Makefile.build:249: fs/proc/task_mmu.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1843: mm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: fs/proc] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1843: fs] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-allmodconfig_m68k-gcc8 # Build took: 0:00:31.364933