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)
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

1  2 
include/linux/socket.h

Simple merge