# git rev-parse -q --verify 5939d45155bb405ab212ef82992a8695b35f6662^{commit} 5939d45155bb405ab212ef82992a8695b35f6662 already have revision, skipping fetch # git checkout -q -f -B kisskb 5939d45155bb405ab212ef82992a8695b35f6662 # git clean -qxdf # < git log -1 # commit 5939d45155bb405ab212ef82992a8695b35f6662 # Merge: e00011a146cd ffe3986fece6 # Author: Linus Torvalds # Date: Fri Apr 12 09:02:24 2024 -0700 # # Merge tag 'trace-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace # # Pull tracing fixes from Steven Rostedt: # # - Fix the buffer_percent accounting as it is dependent on three # variables: # # 1) pages_read - number of subbuffers read # 2) pages_lost - number of subbuffers lost due to overwrite # 3) pages_touched - number of pages that a writer entered # # These three counters only increment, and to know how many active # pages there are on the buffer at any given time, the pages_read and # pages_lost are subtracted from pages_touched. # # But the pages touched was incremented whenever any writer went to the # next subbuffer even if it wasn't the only one, so it was incremented # more than it should be causing the counter for how many subbuffers # currently have content incorrect, which caused the buffer_percent # that holds waiters until the ring buffer is filled to a given # percentage to wake up early. # # - Fix warning of unused functions when PERF_EVENTS is not configured in # # - Replace bad tab with space in Kconfig for FTRACE_RECORD_RECURSION_SIZE # # - Fix to some kerneldoc function comments in eventfs code. # # * tag 'trace-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: # ring-buffer: Only update pages_touched when a new page is touched # tracing: hide unused ftrace_event_id_fops # tracing: Fix FTRACE_RECORD_RECURSION_SIZE Kconfig entry # eventfs: Fix kernel-doc comments to functions # < /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 5939d45155bb405ab212ef82992a8695b35f6662 # 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:10:49.763908