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:
Greg Kroah-Hartman <gregkh@google.com>
Loading