# git rev-parse -q --verify ec6f5e0e5ca0764b4bc522c9f9d5abf876a0e3e3^{commit} ec6f5e0e5ca0764b4bc522c9f9d5abf876a0e3e3 already have revision, skipping fetch # git checkout -q -f -B kisskb ec6f5e0e5ca0764b4bc522c9f9d5abf876a0e3e3 # git clean -qxdf # < git log -1 # commit ec6f5e0e5ca0764b4bc522c9f9d5abf876a0e3e3 # Merge: d2360a398f0b 0d07c0ec4381 # Author: Linus Torvalds # Date: Sun Dec 13 11:31:19 2020 -0800 # # Merge tag 'x86-urgent-2020-12-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 fixes from Thomas Gleixner: # "A set of x86 and membarrier fixes: # # - Correct a few problems in the x86 and the generic membarrier # implementation. Small corrections for assumptions about visibility # which have turned out not to be true. # # - Make the PAT bits for memory encryption correct vs 4K and 2M/1G # page table entries as they are at a different location. # # - Fix a concurrency issue in the the local bandwidth readout of # resource control leading to incorrect values # # - Fix the ordering of allocating a vector for an interrupt. The order # missed to respect the provided cpumask when the first attempt of # allocating node local in the mask fails. It then tries the node # instead of trying the full provided mask first. This leads to # erroneous error messages and breaking the (user) supplied affinity # request. Reorder it. # # - Make the INT3 padding detection in optprobe work correctly" # # * tag 'x86-urgent-2020-12-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/kprobes: Fix optprobe to detect INT3 padding correctly # x86/apic/vector: Fix ordering in vector assignment # x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled # x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP # membarrier: Execute SYNC_CORE on the calling thread # membarrier: Explicitly sync remote cores when SYNC_CORE is requested # membarrier: Add an actual barrier before rseq_preempt() # x86/membarrier: Get rid of a dubious optimization # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 ec6f5e0e5ca0764b4bc522c9f9d5abf876a0e3e3 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- help # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- olddefconfig .config:12743:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261:0: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392:0: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262:0: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393:0: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) ^ FIT description: Linux 5.10.0-rc7+ Created: Mon Dec 14 08:03:14 2020 Image 0 (kernel@0) Description: Linux 5.10.0-rc7+ Created: Mon Dec 14 08:03:14 2020 Type: Kernel Image Compression: gzip compressed Data Size: 8291120 Bytes = 8096.80 KiB = 7.91 MiB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x84ca4ea0 Hash algo: sha1 Hash value: 5e6be9d3c2f64b4e4f360f12116f0fb7fb54dd98 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Mon Dec 14 08:03:14 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Mon Dec 14 08:03:14 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Mon Dec 14 08:03:14 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4659 Bytes = 4.55 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 5bcb6e4f21e8e5372544aa130b3bd097355a9050 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Mon Dec 14 08:03:14 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5418 Bytes = 5.29 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 93d882f2009a217e0fa9dab94788535ed2be8476 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Mon Dec 14 08:03:14 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:20:12.818317