Merge branch 'tcp-pass-back-data-left-in-socket-after-receive' of git://git.kernel...
authorJens Axboe <axboe@kernel.dk>
Sat, 30 Apr 2022 03:11:15 +0000 (21:11 -0600)
committerJens Axboe <axboe@kernel.dk>
Sat, 30 Apr 2022 03:11:15 +0000 (21:11 -0600)
commita4c76853609107f0e5e7b51571d966785fe89cb3
tree61e8bbfbb154144942a0c77841b7bbe87ebd3c86
parent27738039fcdc6cb63400fe9b820b4027753568b7
parentf94fd25cb0aaf77fd7453f31c5d394a1a68ecf60
Merge branch 'tcp-pass-back-data-left-in-socket-after-receive' of git://git./linux/kernel/git/kuba/linux into for-5.19/io_uring-net

Merge net branch with the required patch for supporting the io_uring
feature that passes back whether we had more data in the socket or not.

* 'tcp-pass-back-data-left-in-socket-after-receive' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux:
  tcp: pass back data left in socket after receive
include/linux/socket.h