Commit 2ed1547e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge ef79f2de ("tracing: Correct the refcount if the hist/hist_debug file... 


Merge ef79f2de ("tracing: Correct the refcount if the hist/hist_debug file fails to open") into android16-6.12

Steps on the way to 6.12.23

Resolves merge conflicts in:
	net/ipv4/udp.c

Change-Id: Ida343c74a69a3f4c3f358486ef6339b55a5e6afe
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 222ab8ee ef79f2de
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