# git rev-parse -q --verify ec7f49619d8ee13e108740c82f942cd401b989e9^{commit} ec7f49619d8ee13e108740c82f942cd401b989e9 already have revision, skipping fetch # git checkout -q -f -B kisskb ec7f49619d8ee13e108740c82f942cd401b989e9 # git clean -qxdf # < git log -1 # commit ec7f49619d8ee13e108740c82f942cd401b989e9 # Merge: d928e8f3af38 eb7bac3973d2 # Author: Linus Torvalds # Date: Fri May 13 16:20:25 2022 -0700 # # Merge tag 'drm-fixes-2022-05-14' of git://anongit.freedesktop.org/drm/drm # # Pull more drm fixes from Dave Airlie: # "Turns out I was right, some fixes hadn't made it to me yet. The vmwgfx # ones also popped up later, but all seem like bad enough things to fix. # The dma-buf, vc4 and nouveau ones are all pretty small. # # The fbdev fixes are a bit more complicated: a fix to cleanup fbdev # devices properly, uncovered some use-after-free bugs in existing # drivers. Then the fix for those bugs wasn't correct. This reverts that # fix, and puts the proper fixes in place in the drivers to avoid the # use-after-frees. # # This has had a fair number of eyes on it at this stage, and I'm # confident enough that it puts things in the right place, and is less # dangerous than reverting our way out of the initial change at this # stage. # # fbdev: # - revert NULL deref fix that turned into a use-after-free # - prevent use-after-free in fbdev # - efifb/simplefb/vesafb: fix cleanup paths to avoid use-after-frees # # dma-buf: # - fix panic in stats setup # # vc4: # - fix hdmi build # # nouveau: # - tegra iommu present fix # - fix leak in backlight name # # vmwgfx: # - Black screen due to fences using FIFO checks on SVGA3 # - Random black screens on boot due to uninitialized drm_mode_fb_cmd2 # - Hangs on SVGA3 due to command buffers being used with gbobjects" # # * tag 'drm-fixes-2022-05-14' of git://anongit.freedesktop.org/drm/drm: # drm/vmwgfx: Disable command buffers on svga3 without gbobjects # drm/vmwgfx: Initialize drm_mode_fb_cmd2 # drm/vmwgfx: Fix fencing on SVGAv3 # drm/vc4: hdmi: Fix build error for implicit function declaration # dma-buf: call dma_buf_stats_setup after dmabuf is in valid list # fbdev: efifb: Fix a use-after-free due early fb_info cleanup # drm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name() # drm/nouveau/tegra: Stop using iommu_present() # fbdev: vesafb: Cleanup fb_info in .fb_destroy rather than .remove # fbdev: efifb: Cleanup fb_info in .fb_destroy rather than .remove # fbdev: simplefb: Cleanup fb_info in .fb_destroy rather than .remove # fbdev: Prevent possible use-after-free in fb_release() # Revert "fbdev: Make fb_release() return -ENODEV if fbdev was unregistered" # < /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 ec7f49619d8ee13e108740c82f942cd401b989e9 # < make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12250:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12253:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12255:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12257:warning: override: reassigning to symbol UML_NET_SLIP .config:12260:warning: override: reassigning to symbol UML_NET_MCAST .config:12262:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /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[5]: *** Waiting for unfinished jobs.... 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.... 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:26: /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:1557: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:1561: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.... 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:1834: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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-allmodconfig_um-x86_64 # Build took: 0:04:08.999017