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

Merge 02874ca5 ("tracing: Consider the NULL character when validating the... 


Merge 02874ca5 ("tracing: Consider the NULL character when validating the event length") into android12-5.10-lts

Steps on the way to 5.10.229

Resolves conflicts in:
	drivers/net/macsec.c

Change-Id: Ibc2583ddd810808fa9ce619e71935aeb5f97805a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 012423e6 02874ca5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment