Merge 2f420df7 ("drm/sti: remove duplicate object names") into android14-5.15-lts
Steps on the way to 5.15.181
Resolves merge conflicts in:
fs/nfsd/nfs4state.c
kernel/sched/cpufreq_schedutil.c
Change-Id: I04de60f0143b1c5517968ee30b4942650a4743ae
Signed-off-by:
Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment