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

Merge 0d0d55b3 ("riscv: Remove duplicated GET_RM") into android14-5.15-lts 



Steps on the way to 5.15.171

Resolves merge conflicts in:
	include/net/ip_tunnels.h

Change-Id: I26f23ed78703e5d6c7eba0bb0e1e98949ed921ac
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 7d05d4dc 0d0d55b3
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