Merge branch 'for-uring-ubufops' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@kernel.dk>
Tue, 23 Apr 2024 01:30:05 +0000 (19:30 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 23 Apr 2024 01:30:05 +0000 (19:30 -0600)
commit3830fff39941bd41f50d3bb8355883276d7b0771
treea7f3bd3e5f13b3bcc4281849ffb6392c6c1a9672
parent2f9c9515bdfde9e4df1f35782284074d3625ff8a
parent65bada80dec1f2108a751644773b2120bd789934
Merge branch 'for-uring-ubufops' of git://git./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 <axboe@kernel.dk>
io_uring/notif.c