# git rev-parse -q --verify 7403e6d8263937dea206dd201fed1ceed190ca18^{commit} 7403e6d8263937dea206dd201fed1ceed190ca18 already have revision, skipping fetch # git checkout -q -f -B kisskb 7403e6d8263937dea206dd201fed1ceed190ca18 # git clean -qxdf # < git log -1 # commit 7403e6d8263937dea206dd201fed1ceed190ca18 # Merge: 66711cfea642 f621eb13facb # Author: Linus Torvalds # Date: Thu Mar 24 12:35:59 2022 -0700 # # Merge tag 'vfio-v5.18-rc1' of https://github.com/awilliam/linux-vfio # # Pull VFIO updates from Alex Williamson: # # - Introduce new device migration uAPI and implement device specific # mlx5 vfio-pci variant driver supporting new protocol (Jason # Gunthorpe, Yishai Hadas, Leon Romanovsky) # # - New HiSilicon acc vfio-pci variant driver, also supporting migration # interface (Shameer Kolothum, Longfang Liu) # # - D3hot fixes for vfio-pci-core (Abhishek Sahu) # # - Document new vfio-pci variant driver acceptance criteria # (Alex Williamson) # # - Fix UML build unresolved ioport_{un}map() functions # (Alex Williamson) # # - Fix MAINTAINERS due to header movement (Lukas Bulwahn) # # * tag 'vfio-v5.18-rc1' of https://github.com/awilliam/linux-vfio: (31 commits) # vfio-pci: Provide reviewers and acceptance criteria for variant drivers # MAINTAINERS: adjust entry for header movement in hisilicon qm driver # hisi_acc_vfio_pci: Use its own PCI reset_done error handler # hisi_acc_vfio_pci: Add support for VFIO live migration # crypto: hisilicon/qm: Set the VF QM state register # hisi_acc_vfio_pci: Add helper to retrieve the struct pci_driver # hisi_acc_vfio_pci: Restrict access to VF dev BAR2 migration region # hisi_acc_vfio_pci: add new vfio_pci driver for HiSilicon ACC devices # hisi_acc_qm: Move VF PCI device IDs to common header # crypto: hisilicon/qm: Move few definitions to common header # crypto: hisilicon/qm: Move the QM header to include/linux # vfio/mlx5: Fix to not use 0 as NULL pointer # PCI/IOV: Fix wrong kernel-doc identifier # vfio/mlx5: Use its own PCI reset_done error handler # vfio/pci: Expose vfio_pci_core_aer_err_detected() # vfio/mlx5: Implement vfio_pci driver for mlx5 devices # vfio/mlx5: Expose migration commands over mlx5 device # vfio: Remove migration protocol v1 documentation # vfio: Extend the device migration protocol with RUNNING_P2P # vfio: Define device migration protocol v2 # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 7403e6d8263937dea206dd201fed1ceed190ca18 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12346:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12349:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12351:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12353:warning: override: reassigning to symbol UML_NET_SLIP .config:12356:warning: override: reassigning to symbol UML_NET_MCAST .config:12358:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:25: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1556:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1560:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:88:22: error: 'struct cpuinfo_um' has no member named 'x86_cache_size' return boot_cpu_data.x86_cache_size; ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'cacheless_memcpy': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:100:2: error: implicit declaration of function '__copy_user_nocache' [-Werror=implicit-function-declaration] __copy_user_nocache(dst, (void __user *)src, n, 0); ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:89:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/infiniband/sw/rdmavt/qp.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/sw/rdmavt] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function 'qib_unordered_wc': /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:22: error: 'struct cpuinfo_um' has no member named 'x86_vendor' return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: error: 'X86_VENDOR_AMD' undeclared (first use in this function) return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/hw/qib] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/sw] Error 2 make[3]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband/hw] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1831: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:16:18.348040