# git rev-parse -q --verify 6f6a73c8b715d595977774d48450a734297ab21f^{commit} 6f6a73c8b715d595977774d48450a734297ab21f already have revision, skipping fetch # git checkout -q -f -B kisskb 6f6a73c8b715d595977774d48450a734297ab21f # git clean -qxdf # < git log -1 # commit 6f6a73c8b715d595977774d48450a734297ab21f # Merge: 612ab8ad6414 20561da3a2e1 # Author: Linus Torvalds # Date: Tue Sep 8 11:16:11 2020 -0700 # # Merge tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "The i915 reverts are going to be a bit of a conflict mess for next, so # I decided to dequeue them now, along with some msm fixes for a ring # corruption issue, that Rob sent over the weekend. # # Summary: # # i915: # - revert gpu relocation changes due to regression # # msm: # - fixes for RPTR corruption issue" # # * tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm: # Revert "drm/i915/gem: Delete unused code" # Revert "drm/i915/gem: Async GPU relocations only" # Revert "drm/i915: Remove i915_gem_object_get_dirty_page()" # drm/msm: Disable the RPTR shadow # drm/msm: Disable preemption on all 5xx targets # drm/msm: Enable expanded apriv support for a650 # drm/msm: Split the a5xx preemption record # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 6f6a73c8b715d595977774d48450a734297ab21f # < make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- defconfig # < make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- help # make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- FIT description: Linux 5.9.0-rc4-g6f6a73c8b715 Created: Wed Sep 9 18:46:02 2020 Image 0 (kernel@0) Description: Linux 5.9.0-rc4-g6f6a73c8b715 Created: Wed Sep 9 18:46:02 2020 Type: Kernel Image Compression: gzip compressed Data Size: 5084603 Bytes = 4965.43 KiB = 4.85 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x80951200 Hash algo: sha1 Hash value: c4923c7e64ecbb6bb3bcd17e5fbebf9b8ffef19b Image 1 (fdt@boston) Description: img,boston Device Tree Created: Wed Sep 9 18:46:02 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Wed Sep 9 18:46:02 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Wed Sep 9 18:46:02 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: be2724f58b66c316a61da7c11ced633f4e7e86c7 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Wed Sep 9 18:46:02 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5398 Bytes = 5.27 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 2a757b83ef9e9d35fb6c43bdbde70d311b3e4555 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Wed Sep 9 18:46:02 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mips-gcc4.9 # Build took: 0:02:30.988710