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

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



Steps on the way to 5.15.171

Resolves merge conflicts in:
	drivers/firmware/arm_sdei.c
	include/net/ip_tunnels.h

Change-Id: I05844c8dee4587ec3be42906c73dafb523cd669b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 431fb555 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