Commit ce946a20 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge fc102133 ("Revert "lockd: introduce safe async lock op"") into android14-5.15-lts



Steps on the way to 5.15.157

Resolves conflicts in:
        Documentation/filesystems/nfs/exporting.rst
        fs/lockd/svclock.c
        fs/nfsd/nfs4state.c
        include/linux/exportfs.h

by reverting commit fc102133 ("Revert "lockd: introduce safe async
lock op"") into android14-5.15-lts as that was not in the tree anymore
due to abi fixes earlier.

Change-Id: I2aba7d8db5642134c678e9635ad8a8454874fd5e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents cef4c11c fc102133
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment