# git rev-parse -q --verify c64396cc36c6e60704ab06c1fb1c4a46179c9120^{commit} c64396cc36c6e60704ab06c1fb1c4a46179c9120 already have revision, skipping fetch # git checkout -q -f -B kisskb c64396cc36c6e60704ab06c1fb1c4a46179c9120 # git clean -qxdf # < git log -1 # commit c64396cc36c6e60704ab06c1fb1c4a46179c9120 # Merge: e5ff2cb9cf67 34b1a1ce1458 # Author: Linus Torvalds # Date: Thu Jan 28 11:18:43 2021 -0800 # # Merge tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull locking fixes from Thomas Gleixner: # "A set of PI futex fixes: # # - Address a longstanding issue where the user space part of the PI # futex is not writeable. The kernel returns with inconsistent state # which can in the worst case result in a UAF of a tasks kernel # stack. # # The solution is to establish consistent kernel state which makes # future operations on the futex fail because user space and kernel # space state are inconsistent. Not a problem as PI futexes # fundamentaly require a functional RW mapping and if user space # pulls the rug under it, then it can keep the pieces it asked for. # # - Address an issue where the return value is incorrect in case that # the futex was acquired after a timeout/signal made the waiter drop # out of the rtmutex wait. # # In one of the corner cases the kernel returned an error code # despite having successfully acquired the futex" # # * tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # futex: Handle faults correctly for PI futexes # futex: Simplify fixup_pi_state_owner() # futex: Use pi_state_update_owner() in put_pi_state() # rtmutex: Remove unused argument from rt_mutex_proxy_unlock() # futex: Provide and use pi_state_update_owner() # futex: Replace pointless printk in fixup_owner() # futex: Ensure the correct return value from futex_lock_pi() # < /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 c64396cc36c6e60704ab06c1fb1c4a46179c9120 # < make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 8 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd3f338) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:53 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6445455 Bytes = 6294.39 KiB = 6.15 MiB Load Address: 00000000 Entry Point: 00000000 INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:54 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6477692 Bytes = 6325.87 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:54 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478094 Bytes = 6326.26 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e00314 INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:54 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6479417 Bytes = 6327.56 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:54 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478037 Bytes = 6326.21 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:55 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478038 Bytes = 6326.21 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:55 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478701 Bytes = 6326.86 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:55 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478809 Bytes = 6326.96 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd4fa64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:57 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478687 Bytes = 6326.84 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:57 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6477611 Bytes = 6325.79 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:57 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6477768 Bytes = 6325.95 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478257 Bytes = 6326.42 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6477769 Bytes = 6325.95 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478309 Bytes = 6326.47 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6478289 Bytes = 6326.45 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.11.0-rc5-82345-gc64396cc Created: Fri Jan 29 09:36:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6477847 Bytes = 6326.02 KiB = 6.18 MiB Load Address: 00e00000 Entry Point: 00e00314 Completed OK # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:03:12.481756