From: Linus Torvalds Date: Wed, 1 Nov 2023 21:16:34 +0000 (-1000) Subject: Merge tag 'for-6.7/io_uring-sockopt-2023-10-30' of git://git.kernel.dk/linux X-Git-Tag: 6.7-rc-smb3-client-fixes-part2~89 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=f5277ad1e9768dbd05b1ae8dcdba690215d8c5b7;p=sfrench%2Fcifs-2.6.git Merge tag 'for-6.7/io_uring-sockopt-2023-10-30' of git://git.kernel.dk/linux Pull io_uring {get,set}sockopt support from Jens Axboe: "This adds support for using getsockopt and setsockopt via io_uring. The main use cases for this is to enable use of direct descriptors, rather than first instantiating a normal file descriptor, doing the option tweaking needed, then turning it into a direct descriptor. With this support, we can avoid needing a regular file descriptor completely. The net and bpf bits have been signed off on their side" * tag 'for-6.7/io_uring-sockopt-2023-10-30' of git://git.kernel.dk/linux: selftests/bpf/sockopt: Add io_uring support io_uring/cmd: Introduce SOCKET_URING_OP_SETSOCKOPT io_uring/cmd: Introduce SOCKET_URING_OP_GETSOCKOPT io_uring/cmd: return -EOPNOTSUPP if net is disabled selftests/net: Extract uring helpers to be reusable tools headers: Grab copy of io_uring.h io_uring/cmd: Pass compat mode in issue_flags net/socket: Break down __sys_getsockopt net/socket: Break down __sys_setsockopt bpf: Add sockptr support for setsockopt bpf: Add sockptr support for getsockopt --- f5277ad1e9768dbd05b1ae8dcdba690215d8c5b7