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

Merge 9ad46f1f ("perf: Fix event leak upon exec and file release") into android13-5.15-lts



Steps on the way to 5.15.165

Resolves merge conflicts in:
	include/linux/perf_event.h
	kernel/events/core.c
by merging the commit out of the way as it breaks the Android ABI.

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