diff options
| author | Jens Axboe <[email protected]> | 2024-04-23 01:30:05 +0000 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2024-04-23 01:30:05 +0000 |
| commit | 3830fff39941bd41f50d3bb8355883276d7b0771 (patch) | |
| tree | a7f3bd3e5f13b3bcc4281849ffb6392c6c1a9672 /net/unix/af_unix.c | |
| parent | io_uring/net: support bundles for recv (diff) | |
| parent | net: add callback for setting a ubuf_info to skb (diff) | |
| download | kernel-3830fff39941bd41f50d3bb8355883276d7b0771.tar.gz kernel-3830fff39941bd41f50d3bb8355883276d7b0771.zip | |
Merge branch 'for-uring-ubufops' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux into for-6.10/io_uring
Merge net changes required for the upcoming send zerocopy improvements.
* 'for-uring-ubufops' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux:
net: add callback for setting a ubuf_info to skb
net: extend ubuf_info callback to ops structure
Signed-off-by: Jens Axboe <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions