# git rev-parse -q --verify c2c94b3b187dc92b2002809f489e0f24a41e91bc^{commit} c2c94b3b187dc92b2002809f489e0f24a41e91bc already have revision, skipping fetch # git checkout -q -f -B kisskb c2c94b3b187dc92b2002809f489e0f24a41e91bc # git clean -qxdf # < git log -1 # commit c2c94b3b187dc92b2002809f489e0f24a41e91bc # Merge: 39e77c484bcd ccf34586758c # Author: Linus Torvalds # Date: Fri Jan 21 09:25:38 2022 +0200 # # Merge tag 'drm-next-2022-01-21' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "Thanks to Daniel for taking care of things while I was out, just a set # of merge window fixes that came in this week, two i915 display fixes # and a bunch of misc amdgpu, along with a radeon regression fix. # # amdgpu: # - SR-IOV fix # - VCN harvest fix # - Suspend/resume fixes # - Tahiti fix # - Enable GPU recovery on yellow carp # # radeon: # - Fix error handling regression in radeon_driver_open_kms # # i915: # - Update EHL display voltage swing table # - Fix programming the ADL-P display TC voltage swing" # # * tag 'drm-next-2022-01-21' of git://anongit.freedesktop.org/drm/drm: # drm/radeon: fix error handling in radeon_driver_open_kms # drm/amd/amdgpu: fixing read wrong pf2vf data in SRIOV # drm/amdgpu: apply vcn harvest quirk # drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence # drm/i915/display/ehl: Update voltage swing table # drm/amd/display: Revert W/A for hard hangs on DCN20/DCN21 # drm/amdgpu: drop flags check for CHIP_IP_DISCOVERY # drm/amdgpu: Fix rejecting Tahiti GPUs # drm/amdgpu: don't do resets on APUs which don't support it # drm/amdgpu: invert the logic in amdgpu_device_should_recover_gpu() # drm/amdgpu: Enable recovery on yellow carp # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 c2c94b3b187dc92b2002809f489e0f24a41e91bc # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:13502:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" /kisskb/src/arch/mips/boot/dts/ingenic/jz4780.dtsi:513.33-515.6: Warning (unit_address_format): /nemc@13410000/efuse@d0/eth-mac-addr@0x22: unit name should not have leading "0x" In file included from /kisskb/src/sound/pci/ca0106/ca0106_main.c:156: /kisskb/src/sound/pci/ca0106/ca0106.h:62: error: "PTR" redefined [-Werror] #define PTR 0x00 /* Indexed register set pointer register */ In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/log2.h:12, from /kisskb/src/include/asm-generic/div64.h:55, from /kisskb/src/arch/mips/include/asm/div64.h:89, from /kisskb/src/include/linux/math.h:5, from /kisskb/src/include/linux/delay.h:22, from /kisskb/src/sound/pci/ca0106/ca0106_main.c:124: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: sound/pci/ca0106/ca0106_main.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci/ca0106] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1831: sound] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/lib/test_printf.c:247: error: "PTR" redefined [-Werror] #define PTR ((void *)0x456789ab) In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/lib/test_printf.c:9: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: lib/test_printf.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1831: lib] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:13:37.396938