# git rev-parse -q --verify 77b1a7f7a05c673c187894b4ae898a8c0cdc776c^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 77b1a7f7a05c673c187894b4ae898a8c0cdc776c^{commit} 77b1a7f7a05c673c187894b4ae898a8c0cdc776c # git checkout -q -f -B kisskb 77b1a7f7a05c673c187894b4ae898a8c0cdc776c # git clean -qxdf # < git log -1 # commit 77b1a7f7a05c673c187894b4ae898a8c0cdc776c # Merge: 6e17c6de3ddf 4afc9a402aa3 # Author: Linus Torvalds # Date: Wed Jun 28 10:59:38 2023 -0700 # # Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm # # Pull non-mm updates from Andrew Morton: # # - Arnd Bergmann has fixed a bunch of -Wmissing-prototypes in top-level # directories # # - Douglas Anderson has added a new "buddy" mode to the hardlockup # detector. It permits the detector to work on architectures which # cannot provide the required interrupts, by having CPUs periodically # perform checks on other CPUs # # - Zhen Lei has enhanced kexec's ability to support two crash regions # # - Petr Mladek has done a lot of cleanup on the hard lockup detector's # Kconfig entries # # - And the usual bunch of singleton patches in various places # # * tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (72 commits) # kernel/time/posix-stubs.c: remove duplicated include # ocfs2: remove redundant assignment to variable bit_off # watchdog/hardlockup: fix typo in config HARDLOCKUP_DETECTOR_PREFER_BUDDY # powerpc: move arch_trigger_cpumask_backtrace from nmi.h to irq.h # devres: show which resource was invalid in __devm_ioremap_resource() # watchdog/hardlockup: define HARDLOCKUP_DETECTOR_ARCH # watchdog/sparc64: define HARDLOCKUP_DETECTOR_SPARC64 # watchdog/hardlockup: make HAVE_NMI_WATCHDOG sparc64-specific # watchdog/hardlockup: declare arch_touch_nmi_watchdog() only in linux/nmi.h # watchdog/hardlockup: make the config checks more straightforward # watchdog/hardlockup: sort hardlockup detector related config values a logical way # watchdog/hardlockup: move SMP barriers from common code to buddy code # watchdog/buddy: simplify the dependency for HARDLOCKUP_DETECTOR_PREFER_BUDDY # watchdog/buddy: don't copy the cpumask in watchdog_next_cpu() # watchdog/buddy: cleanup how watchdog_buddy_check_hardlockup() is called # watchdog/hardlockup: remove softlockup comment in touch_nmi_watchdog() # watchdog/hardlockup: in watchdog_hardlockup_check() use cpumask_copy() # watchdog/hardlockup: don't use raw_cpu_ptr() in watchdog_hardlockup_kick() # watchdog/hardlockup: HAVE_NMI_WATCHDOG must implement watchdog_hardlockup_probe() # watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails # ... # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 77b1a7f7a05c673c187894b4ae898a8c0cdc776c # make -s -j 24 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- x86_64_defconfig # < make -s -j 24 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 24 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig # make -s -j 24 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- In file included from /kisskb/src/include/linux/mem_encrypt.h:17, from /kisskb/src/arch/x86/include/asm/page_types.h:7, from /kisskb/src/arch/x86/include/asm/page.h:9, from /kisskb/src/arch/x86/include/asm/thread_info.h:12, from /kisskb/src/include/linux/thread_info.h:60, from /kisskb/src/arch/x86/include/asm/preempt.h:9, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:56, from /kisskb/src/include/linux/swait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/include/linux/crypto.h:15, from /kisskb/src/arch/x86/kernel/asm-offsets.c:9: /kisskb/src/arch/x86/include/asm/mem_encrypt.h:23:20: error: static declaration of 'mem_encrypt_init' follows non-static declaration static inline void mem_encrypt_init(void) { } ^~~~~~~~~~~~~~~~ In file included from /kisskb/src/include/linux/printk.h:6, from /kisskb/src/include/linux/kernel.h:30, from /kisskb/src/arch/x86/include/asm/percpu.h:27, from /kisskb/src/arch/x86/include/asm/preempt.h:6, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:56, from /kisskb/src/include/linux/swait.h:7, from /kisskb/src/include/linux/completion.h:12, from /kisskb/src/include/linux/crypto.h:15, from /kisskb/src/arch/x86/kernel/asm-offsets.c:9: /kisskb/src/include/linux/init.h:158:6: note: previous declaration of 'mem_encrypt_init' was here void mem_encrypt_init(void); ^~~~~~~~~~~~~~~~ make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/x86/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1293: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 24 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 # Build took: 0:00:31.830058