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

Merge a6527128 ("net/sched: act_ipt: add sanity checks on table name and...


Merge a6527128 ("net/sched: act_ipt: add sanity checks on table name and hook locations") into android13-5.15-lts

Steps on the way to 5.15.121

Resolves merge conflicts in:
	sound/core/jack.c

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