]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17a4fde 67cd2e2)
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)
Bring in the fixes for __pollwait() and waitqueue_active() interactions.

Signed-off-by: Christian Brauner <brauner@kernel.org>
1  2 
include/net/sock.h patch | diff1 | diff2 | blob | history
io_uring/io_uring.c patch | diff1 | diff2 | blob | history

diff --cc include/net/sock.h
Simple merge
diff --cc io_uring/io_uring.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.