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

Merge 9b8a8e5e ("nfsd: don't allow nfsd threads to be signalled.") into android14-5.15-lts



Steps on the way to 5.15.160

Resolves merge conflicts in:
	fs/nfsd/nfssvc.c

By merging commit 9b8a8e5e ("nfsd: don't allow nfsd threads to be
signalled.") out of the way as it is not needed in this branch due to
previous reverts.

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