# git rev-parse -q --verify 9c9155a3509a2ebdb06d77c7a621e9685c802eac^{commit} 9c9155a3509a2ebdb06d77c7a621e9685c802eac already have revision, skipping fetch # git checkout -q -f -B kisskb 9c9155a3509a2ebdb06d77c7a621e9685c802eac # git clean -qxdf # < git log -1 # commit 9c9155a3509a2ebdb06d77c7a621e9685c802eac # Merge: a521fc3cfbf4 fc3523a833c9 # Author: Linus Torvalds # Date: Thu Oct 13 21:56:34 2022 -0700 # # Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm # # Pull more drm updates from Dave Airlie: # "Round of fixes for the merge window stuff, bunch of amdgpu and i915 # changes, this should have the gcc11 warning fix, amongst other # changes. # # amdgpu: # - DC mutex fix # - DC SubVP fixes # - DCN 3.2.x fixes # - DCN 3.1.x fixes # - SDMA 6.x fixes # - Enable DPIA for 3.1.4 # - VRR fixes # - VRAM BO swapping fix # - Revert dirty fb helper change # - SR-IOV suspend/resume fixes # - Work around GCC array bounds check fail warning # - UMC 8.10 fixes # - Misc fixes and cleanups # # i915: # - Round to closest in g4x+ HDMI clock readout # - Update MOCS table for EHL # - Fix PSR_IMR/IIR field handling # - Fix watermark calculations for gen12+/DG2 modifiers # - Reject excessive dotclocks early # - Fix revocation of non-persistent contexts # - Handle migration for dpt # - Fix display problems after resume # - Allow control over the flags when migrating # - Consider DG2_RC_CCS_CC when migrating buffers" # # * tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm: (110 commits) # drm/amd/display: Add HUBP surface flip interrupt handler # drm/i915/display: consider DG2_RC_CCS_CC when migrating buffers # drm/i915: allow control over the flags when migrating # drm/amd/display: Simplify bool conversion # drm/amd/display: fix transfer function passed to build_coefficients() # drm/amd/display: add a license to cursor_reg_cache.h # drm/amd/display: make virtual_disable_link_output static # drm/amd/display: fix indentation in dc.c # drm/amd/display: make dcn32_split_stream_for_mpc_or_odm static # drm/amd/display: fix build error on arm64 # drm/amd/display: 3.2.207 # drm/amd/display: Clean some DCN32 macros # drm/amdgpu: Add poison mode query for umc v8_10_0 # drm/amdgpu: Update umc v8_10_0 headers # drm/amdgpu: fix coding style issue for mca notifier # drm/amdgpu: define convert_error_address for umc v8.7 # drm/amdgpu: define RAS convert_error_address API # drm/amdgpu: remove check for CE in RAS error address query # drm/i915: Fix display problems after resume # drm/amd/display: fix array-bounds error in dc_stream_remove_writeback() [take 2] # ... # < /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 9c9155a3509a2ebdb06d77c7a621e9685c802eac # < make -s -j 32 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 32 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 32 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:12560:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12565:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12567:warning: override: reassigning to symbol UML_NET_SLIP .config:12570:warning: override: reassigning to symbol UML_NET_MCAST .config:12572:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 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/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:250: arch/um/os-Linux/util.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/um/os-Linux] Error 2 make[2]: *** 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[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/infiniband/sw/rdmavt/qp.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/sw/rdmavt] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/sw] Error 2 make[4]: *** 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:94: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:1930: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:1934:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** 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[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/hw/qib] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/hw] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband] Error 2 make[3]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:1990: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 32 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:14:51.420418