Commit 59c86868 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 android13-5.10-lts

Steps on the way to 5.10.229

Resolves merge conflicts in:
	drivers/net/macsec.c

Change-Id: I6bbc4f673d07763a54d52debb13db94605dae8be
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0eb852f4 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