# git rev-parse -q --verify 6daa755f813e6aa0bcc97e352666e072b1baac25^{commit} 6daa755f813e6aa0bcc97e352666e072b1baac25 already have revision, skipping fetch # git checkout -q -f -B kisskb 6daa755f813e6aa0bcc97e352666e072b1baac25 # git clean -qxdf # < git log -1 # commit 6daa755f813e6aa0bcc97e352666e072b1baac25 # Merge: c6536676c7fe 6f3353c2d2b3 # Author: Linus Torvalds # Date: Tue Apr 27 17:54:15 2021 -0700 # # Merge tag 's390-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux # # Pull s390 updates from Heiko Carstens: # # - fix buffer size for in-kernel disassembler for ebpf programs. # # - fix two memory leaks in zcrypt driver. # # - expose PCI device UID as index, including an indicator if the uid is # unique. # # - remove some oprofile leftovers. # # - improve stack unwinder tests. # # - don't use gcc atomic builtins anymore, just like all other # architectures. Even though I'm sure the current code is ok, I totally # dislike that s390 is the only architecture being special here; # especially considering that there was a lengthly discussion about # this topic and the outcome was not to use the builtins. Therefore # open-code atomic ops again with inline assembly and switch to gcc # builtins as soon as other architectures are doing. # # - couple of other changes to atomic and cmpxchg, and use # atomic-instrumented.h for KASAN. # # - separate zbus creation, registration, and scanning in our PCI code # which allows for cleaner and easier handling. # # - a rather large change to the vfio-ap code to fix circular locking # dependencies when updating crypto masks. # # - move QAOB handling from qdio layer down to drivers. # # - add CRW inject facility to common I/O layer. This adds debugs files # which allow to generate artificial events from user space for testing # purposes. # # - increase SCLP console line length from 80 to 320 characters to avoid # odd wrapped lines. # # - add protected virtualization guest and host indication files, which # indicate either that a guest is running in pv mode or if the # hypervisor is capable of starting pv guests. # # - various other small fixes and improvements all over the place. # # * tag 's390-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (53 commits) # s390/disassembler: increase ebpf disasm buffer size # s390/archrandom: add parameter check for s390_arch_random_generate # s390/zcrypt: fix zcard and zqueue hot-unplug memleak # s390/pci: expose a PCI device's UID as its index # s390/atomic,cmpxchg: always inline __xchg/__cmpxchg # s390/smp: fix do_restart() prototype # s390: get rid of oprofile leftovers # s390/atomic,cmpxchg: make constraints work with old compilers # s390/test_unwind: print test suite start/end info # s390/cmpxchg: use unsigned long values instead of void pointers # s390/test_unwind: add WARN if tests failed # s390/test_unwind: unify error handling paths # s390: update defconfigs # s390/spinlock: use R constraint in inline assembly # s390/atomic,cmpxchg: switch to use atomic-instrumented.h # s390/cmpxchg: get rid of gcc atomic builtins # s390/atomic: get rid of gcc atomic builtins # s390/atomic: use proper constraints # s390/atomic: move remaining inline assemblies to atomic_ops.h # s390/bitops: make bitops only work on longs # ... # < /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 6daa755f813e6aa0bcc97e352666e072b1baac25 # < make -s -j 32 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 32 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 32 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 32 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 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd64c14) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd544e8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6511066 Bytes = 6358.46 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509238 Bytes = 6356.68 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6511027 Bytes = 6358.42 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509047 Bytes = 6356.49 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509102 Bytes = 6356.54 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6511356 Bytes = 6358.75 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6477798 Bytes = 6325.97 KiB = 6.18 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6510030 Bytes = 6357.45 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509765 Bytes = 6357.19 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509845 Bytes = 6357.27 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509849 Bytes = 6357.27 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509210 Bytes = 6356.65 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6510032 Bytes = 6357.45 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509648 Bytes = 6357.08 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6509104 Bytes = 6356.55 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g6daa755f813e Created: Wed Apr 28 11:52:12 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6510748 Bytes = 6358.15 KiB = 6.21 MiB Load Address: 00e00000 Entry Point: 00e002a4 Completed OK # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:02:28.994108