Merge branch 'vfs-6.14.poll' into vfs.fixes
authorChristian Brauner <brauner@kernel.org>
Fri, 10 Jan 2025 11:01:21 +0000 (12:01 +0100)
committerChristian Brauner <brauner@kernel.org>
Fri, 10 Jan 2025 11:01:21 +0000 (12:01 +0100)
commit1623bc27a85a93e82194c8d077eccc464efa67db
tree491bd1e87d00a93d474579365add4d0dceb54fc1
parent17a4fde81d3a7478d97d15304a6d61094a10c2e3
parent67cd2e23c0f353803f182ae790a7d5074d4c1a4d
Merge branch 'vfs-6.14.poll' into vfs.fixes

Bring in the fixes for __pollwait() and waitqueue_active() interactions.

Signed-off-by: Christian Brauner <brauner@kernel.org>
include/net/sock.h
io_uring/io_uring.c