# git rev-parse -q --verify 9fb4c5250f10dc4d8257cd766991be690eb25c5b^{commit} 9fb4c5250f10dc4d8257cd766991be690eb25c5b already have revision, skipping fetch # git checkout -q -f -B kisskb 9fb4c5250f10dc4d8257cd766991be690eb25c5b # git clean -qxdf # < git log -1 # commit 9fb4c5250f10dc4d8257cd766991be690eb25c5b # Merge: a789d5f8a99a f55d9895884b # Author: Linus Torvalds # Date: Thu Jun 4 11:13:03 2020 -0700 # # Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching # # Pull livepatching updates from Jiri Kosina: # # - simplifications and improvements for issues Peter Ziljstra found # during his previous work on W^X cleanups. # # This allows us to remove livepatch arch-specific .klp.arch sections # and add proper support for jump labels in patched code. # # Also, this patchset removes the last module_disable_ro() usage in the # tree. # # Patches from Josh Poimboeuf and Peter Zijlstra # # - a few other minor cleanups # # * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: # MAINTAINERS: add lib/livepatch to LIVE PATCHING # livepatch: add arch-specific headers to MAINTAINERS # livepatch: Make klp_apply_object_relocs static # MAINTAINERS: adjust to livepatch .klp.arch removal # module: Make module_enable_ro() static again # x86/module: Use text_mutex in apply_relocate_add() # module: Remove module_disable_ro() # livepatch: Remove module_disable_ro() usage # x86/module: Use text_poke() for late relocations # s390/module: Use s390_kernel_write() for late relocations # s390: Change s390_kernel_write() return type to match memcpy() # livepatch: Prevent module-specific KLP rela sections from referencing vmlinux symbols # livepatch: Remove .klp.arch # livepatch: Apply vmlinux-specific KLP relocations early # livepatch: Disallow vmlinux.ko # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux-ld --version # < git log --format=%s --max-count=1 9fb4c5250f10dc4d8257cd766991be690eb25c5b # < make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- defconfig # < make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- help # make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- olddefconfig # make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/kernel/module.c: In function 'do_init_module': /kisskb/src/kernel/module.c:3593:2: error: implicit declaration of function 'module_enable_ro' [-Werror=implicit-function-declaration] module_enable_ro(mod, true); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:267: kernel/module.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1735: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/ia64/include/uapi/asm/intrinsics.h:22:0, from /kisskb/src/arch/ia64/include/asm/intrinsics.h:11, from /kisskb/src/arch/ia64/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:29, from /kisskb/src/include/linux/kernel.h:12, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/preempt.h:11, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/fs/nfs/read.c:11: /kisskb/src/fs/nfs/read.c: In function 'nfs_read_completion': /kisskb/src/arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)))) ^ /kisskb/src/fs/nfs/read.c:196:5: note: in expansion of macro 'xchg' xchg(&nfs_req_openctx(req)->error, error); ^ /kisskb/src/fs/nfs/read.c: In function 'nfs_readpage': /kisskb/src/arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)))) ^ /kisskb/src/fs/nfs/read.c:353:2: note: in expansion of macro 'xchg' xchg(&ctx->error, 0); ^ make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 # Build took: 0:04:15.080195