# git gc Expanding reachable commits in commit graph: 54545 Expanding reachable commits in commit graph: 111967 Expanding reachable commits in commit graph: 170010 Expanding reachable commits in commit graph: 229270 Expanding reachable commits in commit graph: 287752 Expanding reachable commits in commit graph: 347890 Expanding reachable commits in commit graph: 408311 Expanding reachable commits in commit graph: 469379 Expanding reachable commits in commit graph: 527040 Expanding reachable commits in commit graph: 588196 Expanding reachable commits in commit graph: 647741 Expanding reachable commits in commit graph: 708115 Expanding reachable commits in commit graph: 768489 Expanding reachable commits in commit graph: 828850 Expanding reachable commits in commit graph: 889738 Expanding reachable commits in commit graph: 949384 Expanding reachable commits in commit graph: 1009324 Expanding reachable commits in commit graph: 1061051 Expanding reachable commits in commit graph: 1124386 Expanding reachable commits in commit graph: 1188538 Expanding reachable commits in commit graph: 1256031 Expanding reachable commits in commit graph: 1294815, done. Writing out commit graph in 4 passes: 53% (2783747/5179260) Writing out commit graph in 4 passes: 54% (2796801/5179260) Writing out commit graph in 4 passes: 55% (2848593/5179260) Writing out commit graph in 4 passes: 56% (2900386/5179260) Writing out commit graph in 4 passes: 57% (2952179/5179260) Writing out commit graph in 4 passes: 58% (3003971/5179260) Writing out commit graph in 4 passes: 59% (3055764/5179260) Writing out commit graph in 4 passes: 60% (3107556/5179260) Writing out commit graph in 4 passes: 60% (3128896/5179260) Writing out commit graph in 4 passes: 61% (3159349/5179260) Writing out commit graph in 4 passes: 62% (3211142/5179260) Writing out commit graph in 4 passes: 63% (3262934/5179260) Writing out commit graph in 4 passes: 64% (3314727/5179260) Writing out commit graph in 4 passes: 65% (3366519/5179260) Writing out commit graph in 4 passes: 66% (3418312/5179260) Writing out commit graph in 4 passes: 67% (3470105/5179260) Writing out commit graph in 4 passes: 67% (3472687/5179260) Writing out commit graph in 4 passes: 68% (3521897/5179260) Writing out commit graph in 4 passes: 69% (3573690/5179260) Writing out commit graph in 4 passes: 70% (3625482/5179260) Writing out commit graph in 4 passes: 71% (3677275/5179260) Writing out commit graph in 4 passes: 72% (3729068/5179260) Writing out commit graph in 4 passes: 73% (3780860/5179260) Writing out commit graph in 4 passes: 73% (3818719/5179260) Writing out commit graph in 4 passes: 74% (3832653/5179260) Writing out commit graph in 4 passes: 75% (3884445/5179260) Writing out commit graph in 4 passes: 76% (3936238/5179260) Writing out commit graph in 4 passes: 77% (3988031/5179260) Writing out commit graph in 4 passes: 78% (4039823/5179260) Writing out commit graph in 4 passes: 79% (4091616/5179260) Writing out commit graph in 4 passes: 80% (4143408/5179260) Writing out commit graph in 4 passes: 81% (4195201/5179260) Writing out commit graph in 4 passes: 82% (4246994/5179260) Writing out commit graph in 4 passes: 83% (4298786/5179260) Writing out commit graph in 4 passes: 84% (4350579/5179260) Writing out commit graph in 4 passes: 85% (4402371/5179260) Writing out commit graph in 4 passes: 86% (4454164/5179260) Writing out commit graph in 4 passes: 87% (4505957/5179260) Writing out commit graph in 4 passes: 88% (4557749/5179260) Writing out commit graph in 4 passes: 89% (4609542/5179260) Writing out commit graph in 4 passes: 90% (4661334/5179260) Writing out commit graph in 4 passes: 91% (4713127/5179260) Writing out commit graph in 4 passes: 92% (4764920/5179260) Writing out commit graph in 4 passes: 93% (4816712/5179260) Writing out commit graph in 4 passes: 94% (4868505/5179260) Writing out commit graph in 4 passes: 95% (4920297/5179260) Writing out commit graph in 4 passes: 96% (4972090/5179260) Writing out commit graph in 4 passes: 97% (5023883/5179260) Writing out commit graph in 4 passes: 98% (5075675/5179260) Writing out commit graph in 4 passes: 99% (5127468/5179260) Writing out commit graph in 4 passes: 100% (5179260/5179260) Writing out commit graph in 4 passes: 100% (5179260/5179260), done. # git rev-parse -q --verify a5dbd76a89423eca9f8de338350f2666aacfb432^{commit} a5dbd76a89423eca9f8de338350f2666aacfb432 already have revision, skipping fetch # git checkout -q -f -B kisskb a5dbd76a89423eca9f8de338350f2666aacfb432 # git clean -qxdf # < git log -1 # commit a5dbd76a89423eca9f8de338350f2666aacfb432 # Merge: 61ca6c78295e dd35a0933269 # Author: Linus Torvalds # Date: Sun Aug 4 08:57:08 2024 -0700 # # Merge tag 'x86-urgent-2024-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 fixes from Thomas Gleixner: # # - Prevent a deadlock on cpu_hotplug_lock in the aperf/mperf driver. # # A recent change in the ACPI code which consolidated code pathes moved # the invocation of init_freq_invariance_cppc() to be moved to a CPU # hotplug handler. The first invocation on AMD CPUs ends up enabling a # static branch which dead locks because the static branch enable tries # to acquire cpu_hotplug_lock but that lock is already held write by # the hotplug machinery. # # Use static_branch_enable_cpuslocked() instead and take the hotplug # lock read for the Intel code path which is invoked from the # architecture code outside of the CPU hotplug operations. # # - Fix the number of reserved bits in the sev_config structure bit field # so that the bitfield does not exceed 64 bit. # # - Add missing Zen5 model numbers # # - Fix the alignment assumptions of pti_clone_pgtable() and # clone_entry_text() on 32-bit: # # The code assumes PMD aligned code sections, but on 32-bit the kernel # entry text is not PMD aligned. So depending on the code size and # location, which is configuration and compiler dependent, entry text # can cross a PMD boundary. As the start is not PMD aligned adding PMD # size to the start address is larger than the end address which # results in partially mapped entry code for user space. That causes # endless recursion on the first entry from userspace (usually #PF). # # Cure this by aligning the start address in the addition so it ends up # at the next PMD start address. # # clone_entry_text() enforces PMD mapping, but on 32-bit the tail might # eventually be PTE mapped, which causes a map fail because the PMD for # the tail is not a large page mapping. Use PTI_LEVEL_KERNEL_IMAGE for # the clone() invocation which resolves to PTE on 32-bit and PMD on # 64-bit. # # - Zero the 8-byte case for get_user() on range check failure on 32-bit # # The recend consolidation of the 8-byte get_user() case broke the # zeroing in the failure case again. Establish it by clearing ECX # before the range check and not afterwards as that obvioulsy can't be # reached when the range check fails # # * tag 'x86-urgent-2024-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/uaccess: Zero the 8-byte get_range case on failure on 32-bit # x86/mm: Fix pti_clone_entry_text() for i386 # x86/mm: Fix pti_clone_pgtable() alignment assumption # x86/setup: Parse the builtin command line before merging # x86/CPU/AMD: Add models 0x60-0x6f to the Zen5 range # x86/sev: Fix __reserved field in sev_config # x86/aperfmperf: Fix deadlock on cpu_hotplug_lock # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 a5dbd76a89423eca9f8de338350f2666aacfb432 # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_allmodconfig_m68k-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/m68k-linux/bin/m68k-linux- Completed OK # rm -rf /kisskb/build/linus_allmodconfig_m68k-gcc13 # Build took: 0:15:08.381103