# git rev-parse -q --verify 36a14638f7c06546717cc1316fcfee6da42b98cc^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 36a14638f7c06546717cc1316fcfee6da42b98cc^{commit} 36a14638f7c06546717cc1316fcfee6da42b98cc # git checkout -q -f -B kisskb 36a14638f7c06546717cc1316fcfee6da42b98cc # git clean -qxdf # < git log -1 # commit 36a14638f7c06546717cc1316fcfee6da42b98cc # Merge: 47fbbc94dab6 9fcb51c14da2 # Author: Linus Torvalds # Date: Sun Mar 28 12:19:16 2021 -0700 # # Merge tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 fixes from Ingo Molnar: # "Two fixes: # # - Fix build failure on Ubuntu with new GCC packages that turn # on -fcf-protection # # - Fix SME memory encryption PTE encoding bug - AFAICT the code # worked on 4K page sizes (level 1) but had the wrong shift at # higher page level orders (level 2 and higher)" # # * tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/build: Turn off -fcf-protection for realmode targets # x86/mem_encrypt: Correct physical address calculation in __set_clr_pte_enc() # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 36a14638f7c06546717cc1316fcfee6da42b98cc # < make -s -j 10 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig KCONFIG_SEED=0xFBCB59C4 # 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 # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 10 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 10 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:5052:warning: override: reassigning to symbol STANDALONE .config:5056:warning: override: reassigning to symbol PPC64 .config:5057:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:5058:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:5059:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:5064:warning: override: reassigning to symbol UBSAN # make -s -j 10 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/arch/powerpc/kernel/eeh.c:1571:12: warning: 'proc_eeh_show' defined but not used [-Wunused-function] static int proc_eeh_show(struct seq_file *m, void *v) ^ /kisskb/src/drivers/vfio/pci/vfio_pci_nvlink2.c: In function 'vfio_pci_nvgpu_release': /kisskb/src/drivers/vfio/pci/vfio_pci_nvlink2.c:101:4: error: implicit declaration of function 'mm_iommu_put' [-Werror=implicit-function-declaration] ret = mm_iommu_put(data->mm, data->mem); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_nvlink2.c: In function 'vfio_pci_nvgpu_mmap': /kisskb/src/drivers/vfio/pci/vfio_pci_nvlink2.c:165:2: error: implicit declaration of function 'mm_iommu_newdev' [-Werror=implicit-function-declaration] ret = (int) mm_iommu_newdev(data->mm, data->useraddr, ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/vfio/pci/vfio_pci_nvlink2.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/vfio/pci] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/vfio] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/net/ethernet/chelsio/cxgb4/sge.c: In function 'cxgb4_write_partial_sgl': /kisskb/src/drivers/net/ethernet/chelsio/cxgb4/sge.c:910:9: warning: missing braces around initializer [-Wmissing-braces] struct ulptx_sge_pair buf[MAX_SKB_FRAGS / 2 + 1] = {0}, *to; ^ /kisskb/src/drivers/net/ethernet/chelsio/cxgb4/sge.c:910:9: warning: (near initialization for 'buf[0]') [-Wmissing-braces] make[1]: *** [/kisskb/src/Makefile:1851: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 10 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:08:24.889878