# git rev-parse -q --verify 20621d2f27a0163b81dc2b74fd4c0b3e6aa5fa12^{commit} 20621d2f27a0163b81dc2b74fd4c0b3e6aa5fa12 already have revision, skipping fetch # git checkout -q -f -B kisskb 20621d2f27a0163b81dc2b74fd4c0b3e6aa5fa12 # git clean -qxdf # < git log -1 # commit 20621d2f27a0163b81dc2b74fd4c0b3e6aa5fa12 # Merge: fec3036200b7 81065b35e248 # Author: Linus Torvalds # Date: Sun Sep 19 13:29:36 2021 -0700 # # Merge tag 'x86_urgent_for_v5.15_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 fixes from Borislav Petkov: # # - Prevent a infinite loop in the MCE recovery on return to user space, # which was caused by a second MCE queueing work for the same page and # thereby creating a circular work list. # # - Make kern_addr_valid() handle existing PMD entries, which are marked # not present in the higher level page table, correctly instead of # blindly dereferencing them. # # - Pass a valid address to sanitize_phys(). This was caused by the # mixture of inclusive and exclusive ranges. memtype_reserve() expect # 'end' being exclusive, but sanitize_phys() wants it inclusive. This # worked so far, but with end being the end of the physical address # space the fail is exposed. # # - Increase the maximum supported GPIO numbers for 64bit. Newer SoCs # exceed the previous maximum. # # * tag 'x86_urgent_for_v5.15_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/mce: Avoid infinite loop for copy from user recovery # x86/mm: Fix kern_addr_valid() to cope with existing but not present entries # x86/platform: Increase maximum GPIO number for X86_64 # x86/pat: Pass valid address to sanitize_phys() # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 20621d2f27a0163b81dc2b74fd4c0b3e6aa5fa12 # < make -s -j 32 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 32 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 32 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 32 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/scripts/dtc/include-prefixes/arm/bcm2711-rpi-4-b.dts:220.10-231.4: Warning (pci_device_reg): /scb/pcie@7d500000/pci@1,0: PCI unit address format error, expected "0,0" /kisskb/src/scripts/dtc/include-prefixes/arm/bcm2711-rpi-4-b.dts:220.10-231.4: Warning (pci_device_reg): /scb/pcie@7d500000/pci@1,0: PCI unit address format error, expected "0,0" /kisskb/src/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi:464.3-52: Warning (pci_device_reg): /pcie@f8000000/pcie@0,0:reg: PCI reg address is not configuration space /kisskb/src/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi:464.3-52: Warning (pci_device_reg): /pcie@f8000000/pcie@0,0:reg: PCI reg address is not configuration space /kisskb/src/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi:464.3-52: Warning (pci_device_reg): /pcie@f8000000/pcie@0,0:reg: PCI reg address is not configuration space /kisskb/src/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi:464.3-52: Warning (pci_device_reg): /pcie@f8000000/pcie@0,0:reg: PCI reg address is not configuration space In file included from /kisskb/src/arch/arm64/include/asm/io.h:185, from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/arch/arm64/kernel/asm-offsets.c:13: /kisskb/src/include/asm-generic/io.h:1059:21: error: static declaration of 'pci_iounmap' follows non-static declaration #define pci_iounmap pci_iounmap ^~~~~~~~~~~ /kisskb/src/include/asm-generic/io.h:1060:20: note: in expansion of macro 'pci_iounmap' static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) ^~~~~~~~~~~ In file included from /kisskb/src/include/asm-generic/io.h:19, from /kisskb/src/arch/arm64/include/asm/io.h:185, from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/arch/arm64/kernel/asm-offsets.c:13: /kisskb/src/include/asm-generic/pci_iomap.h:21:13: note: previous declaration of 'pci_iounmap' was here extern void pci_iounmap(struct pci_dev *dev, void __iomem *); ^~~~~~~~~~~ make[2]: *** [/kisskb/src/scripts/Makefile.build:121: arch/arm64/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1219: prepare0] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 # Build took: 0:00:15.642790