# git rev-parse -q --verify a452483508d7b70b0f6c69e249ec0b3ea2330b5c^{commit} a452483508d7b70b0f6c69e249ec0b3ea2330b5c already have revision, skipping fetch # git checkout -q -f -B kisskb a452483508d7b70b0f6c69e249ec0b3ea2330b5c # git clean -qxdf # < git log -1 # commit a452483508d7b70b0f6c69e249ec0b3ea2330b5c # Merge: 7b82e9041182 54372cf04327 # Author: Linus Torvalds # Date: Thu Jul 6 13:18:30 2023 -0700 # # Merge tag 's390-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux # # Pull more s390 updates from Alexander Gordeev: # # - Fix virtual vs physical address confusion in vmem_add_range() and # vmem_remove_range() functions # # - Include instead of and # throughout s390 code # # - Make all PSW related defines also available for assembler files. # Remove PSW_DEFAULT_KEY define from uapi for that # # - When adding an undefined symbol the build still succeeds, but # userspace crashes trying to execute VDSO, because the symbol is not # resolved. Add undefined symbols check to prevent that # # - Use kvmalloc_array() instead of kzalloc() for allocaton of 256k # memory when executing s390 crypto adapter IOCTL # # - Add -fPIE flag to prevent decompressor misaligned symbol build error # with clang # # - Use .balign instead of .align everywhere. This is a no-op for s390, # but with this there no mix in using .align and .balign anymore # # - Filter out -mno-pic-data-is-text-relative flag when compiling kernel # to prevent VDSO build error # # - Rework entering of DAT-on mode on CPU restart to use PSW_KERNEL_BITS # mask directly # # - Do not retry administrative requests to some s390 crypto cards, since # the firmware assumes replay attacks # # - Remove most of the debug code, which is build in when kernel config # option CONFIG_ZCRYPT_DEBUG is enabled # # - Remove CONFIG_ZCRYPT_MULTIDEVNODES kernel config option and switch # off the multiple devices support for the s390 zcrypt device driver # # - With the conversion to generic entry machine checks are accounted to # the current context instead of irq time. As result, the STCKF # instruction at the beginning of the machine check handler and the # lowcore member are no longer required, therefore remove it # # - Fix various typos found with codespell # # - Minor cleanups to CPU-measurement Counter and Sampling Facilities # code # # - Revert patch that removes VMEM_MAX_PHYS macro, since it causes a # regression # # * tag 's390-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (25 commits) # Revert "s390/mm: get rid of VMEM_MAX_PHYS macro" # s390/cpum_sf: remove check on CPU being online # s390/cpum_sf: handle casts consistently # s390/cpum_sf: remove unnecessary debug statement # s390/cpum_sf: remove parameter in call to pr_err # s390/cpum_sf: simplify function setup_pmu_cpu # s390/cpum_cf: remove unneeded debug statements # s390/entry: remove mcck clock # s390: fix various typos # s390/zcrypt: remove ZCRYPT_MULTIDEVNODES kernel config option # s390/zcrypt: do not retry administrative requests # s390/zcrypt: cleanup some debug code # s390/entry: rework entering DAT-on mode on CPU restart # s390/mm: fence off VM macros from asm and linker # s390: include linux/io.h instead of asm/io.h # s390/ptrace: make all psw related defines also available for asm # s390/ptrace: remove PSW_DEFAULT_KEY from uapi # s390/vdso: filter out mno-pic-data-is-text-relative cflag # s390: consistently use .balign instead of .align # s390/decompressor: fix misaligned symbol build error # ... # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 a452483508d7b70b0f6c69e249ec0b3ea2330b5c # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 defconfig # < make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 LINK linux Completed OK # rm -rf /kisskb/build/linus_defconfig_um-x86_64-gcc12 # Build took: 0:00:34.106711