# git rev-parse -q --verify ddf21bd8ab984ccaa924f090fc7f515bb6d51414^{commit} ddf21bd8ab984ccaa924f090fc7f515bb6d51414 already have revision, skipping fetch # git checkout -q -f -B kisskb ddf21bd8ab984ccaa924f090fc7f515bb6d51414 # git clean -qxdf # < git log -1 # commit ddf21bd8ab984ccaa924f090fc7f515bb6d51414 # Merge: 0bc7eb03cbd3 b66ceaf324b3 # Author: Linus Torvalds # Date: Fri Sep 17 09:23:44 2021 -0700 # # Merge tag 'iov_iter.3-5.15-2021-09-17' of git://git.kernel.dk/linux-block # # Pull io_uring iov_iter retry fixes from Jens Axboe: # "This adds a helper to save/restore iov_iter state, and modifies # io_uring to use it. # # After that is done, we can now kill the iter->truncated addition that # we added for this release. The io_uring change is being overly # cautious with the save/restore/advance, but better safe than sorry and # we can always improve that and reduce the overhead if it proves to be # of concern. The only case to be worried about in this regard is huge # IO, where iteration can take a while to iterate segments. # # I spent some time writing test cases, and expanded the coverage quite # a bit from the last posting of this. liburing carries this regression # test case now: # # https://git.kernel.dk/cgit/liburing/tree/test/file-verify.c # # which exercises all of this. It now also supports provided buffers, # and explicitly tests for end-of-file/device truncation as well. # # On top of that, Pavel sanitized the IOPOLL retry path to follow the # exact same pattern as normal IO" # # * tag 'iov_iter.3-5.15-2021-09-17' of git://git.kernel.dk/linux-block: # io_uring: move iopoll reissue into regular IO path # Revert "iov_iter: track truncated size" # io_uring: use iov_iter state save/restore helpers # iov_iter: add helper to save iov_iter state # < /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 ddf21bd8ab984ccaa924f090fc7f515bb6d51414 # < make -s -j 120 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 120 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 120 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:13220:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 120 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" In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261: error: "M_SPC_CFG_CLEAR" redefined [-Werror] #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262: error: "M_SPC_CFG_ENABLE" redefined [-Werror] #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/watchdog/sb_wdog.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/watchdog] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1868: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 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:11:47.628198