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

Merge 3f73da56 ("media: uapi/linux/cec.h: cec_msg_set_reply_to: zero...


Merge 3f73da56 ("media: uapi/linux/cec.h: cec_msg_set_reply_to: zero flags") into android13-5.10-lts

Steps on the way to 5.10.227

Resolves merge conflicts in:
	fs/nfsd/nfs4xdr.c
	fs/nfsd/vfs.c

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