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

Merge 3c0e0aec ("batman-adv: Drop unmanaged ELP metric worker") into android13-5.15-lts 



Steps on the way to 5.15.179

Resolves merge conflicts in:
	fs/f2fs/file.c
	mm/oom_kill.c

Change-Id: I2915c540447da30aa75e005c51482e94e2379eef
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a8a88afa 3c0e0aec
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