# git rev-parse -q --verify 1ee08de1e234d95b5b4f866878b72fceb5372904^{commit} 1ee08de1e234d95b5b4f866878b72fceb5372904 already have revision, skipping fetch # git checkout -q -f -B kisskb 1ee08de1e234d95b5b4f866878b72fceb5372904 # git clean -qxdf # < git log -1 # commit 1ee08de1e234d95b5b4f866878b72fceb5372904 # Merge: bce159d73409 7b53d59859bc # Author: Linus Torvalds # Date: Tue Jun 2 15:42:50 2020 -0700 # # Merge tag 'for-5.8/io_uring-2020-06-01' of git://git.kernel.dk/linux-block # # Pull io_uring updates from Jens Axboe: # "A relatively quiet round, mostly just fixes and code improvements. In # particular: # # - Make statx just use the generic statx handler, instead of open # coding it. We don't need that anymore, as we always call it async # safe (Bijan) # # - Enable closing of the ring itself. Also fixes O_PATH closure (me) # # - Properly name completion members (me) # # - Batch reap of dead file registrations (me) # # - Allow IORING_OP_POLL with double waitqueues (me) # # - Add tee(2) support (Pavel) # # - Remove double off read (Pavel) # # - Fix overflow cancellations (Pavel) # # - Improve CQ timeouts (Pavel) # # - Async defer drain fixes (Pavel) # # - Add support for enabling/disabling notifications on a registered # eventfd (Stefano) # # - Remove dead state parameter (Xiaoguang) # # - Disable SQPOLL submit on dying ctx (Xiaoguang) # # - Various code cleanups" # # * tag 'for-5.8/io_uring-2020-06-01' of git://git.kernel.dk/linux-block: (29 commits) # io_uring: fix overflowed reqs cancellation # io_uring: off timeouts based only on completions # io_uring: move timeouts flushing to a helper # statx: hide interfaces no longer used by io_uring # io_uring: call statx directly # statx: allow system call to be invoked from io_uring # io_uring: add io_statx structure # io_uring: get rid of manual punting in io_close # io_uring: separate DRAIN flushing into a cold path # io_uring: don't re-read sqe->off in timeout_prep() # io_uring: simplify io_timeout locking # io_uring: fix flush req->refs underflow # io_uring: don't submit sqes when ctx->refs is dying # io_uring: async task poll trigger cleanup # io_uring: add tee(2) support # splice: export do_tee() # io_uring: don't repeat valid flag list # io_uring: rename io_file_put() # io_uring: remove req->needs_fixed_files # io_uring: cleanup io_poll_remove_one() logic # ... # < /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 1ee08de1e234d95b5b4f866878b72fceb5372904 # < make -s -j 10 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 10 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 10 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 10 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/cpu/sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type return ioread8(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread8(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type return ioread16(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread16(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type return ioread32(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread32(void __iomem *); ^ /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:1119: vmlinux] Error 1 make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 10 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:01:02.048820