# git rev-parse -q --verify 9ccce092fc64d19504fa54de4fd659e279cc92e7^{commit} 9ccce092fc64d19504fa54de4fd659e279cc92e7 already have revision, skipping fetch # git checkout -q -f -B kisskb 9ccce092fc64d19504fa54de4fd659e279cc92e7 # git clean -qxdf # < git log -1 # commit 9ccce092fc64d19504fa54de4fd659e279cc92e7 # Merge: 27787ba3fa49 211f9f2e0503 # Author: Linus Torvalds # Date: Sun May 2 14:13:46 2021 -0700 # # Merge tag 'for-linus-5.13-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux # # Pull orangefs updates from Mike Marshall: # "orangefs: implement orangefs_readahead # # mm/readahead.c/read_pages was quite a bit different back when I put my # open-coded readahead logic into orangefs_readpage. That logic seemed # to work as designed back then, it is a trainwreck now. # # This implements orangefs_readahead using the new xarray and # readahead_expand features and removes all my open-coded readahead # logic. # # This results in an extreme read performance improvement, these sample # numbers are from my test VM: # # Here's an example of what's upstream in # 5.11.8-200.fc33.x86_64: # # 30+0 records in # 30+0 records out # 125829120 bytes (126 MB, 120 MiB) copied, 5.77943 s, 21.8 MB/s # # And here's this version of orangefs_readahead on top of 5.12.0-rc4: # # 30+0 records in # 30+0 records out # 125829120 bytes (126 MB, 120 MiB) copied, 0.325919 s, 386 MB/s # # There are four xfstest regressions with this patch. David Howells and # Matthew Wilcox have been helping me work with this code" # # * tag 'for-linus-5.13-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: # orangefs: leave files in the page cache for a few micro seconds at least # Orangef: implement orangefs_readahead. # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 9ccce092fc64d19504fa54de4fd659e279cc92e7 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7710voipgw_defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/traps.c: In function 'nmi_trap_handler': /kisskb/src/arch/sh/kernel/traps.c:183:15: warning: unused variable 'cpu' [-Wunused-variable] unsigned int cpu = smp_processor_id(); ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses dsp instructions while previous modules use floating point instructions /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses instructions which are incompatible with instructions used in previous modules /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: failed to merge target specific data of file kernel/sched/core.o make[1]: *** [/kisskb/src/Makefile:1196: vmlinux] Error 1 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 # Build took: 0:00:38.379589