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

Merge a89f73ed ("scripts/gdb: fix SB_* constants parsing") into android14-5.15-lts



Steps on the way to 5.15.161

Resolves merge conflicts in:
	drivers/hwtracing/coresight/coresight-etm4x-core.c
	fs/f2fs/extent_cache.c
	fs/f2fs/file.c
	tools/lib/subcmd/parse-options.c

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