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

Merge 48ca7139 ("cifs: Fix validation of SMB1 query reparse point...


Merge 48ca7139 ("cifs: Fix validation of SMB1 query reparse point response") into android16-6.12-lts

Steps on the way to 6.12.34

Resolves merge conflicts in:
	kernel/sched/core.c
	net/netfilter/xt_mark.c

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