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

Merge 7b4ea945 ("Revert "x86/mm/64: Do not sync vmalloc/ioremap...


Merge 7b4ea945 ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline

Steps on the way to 5.9-rc1

Resolves conflicts in:
	drivers/irqchip/qcom-pdc.c
	include/linux/device.h
	net/xfrm/xfrm_state.c
	security/lsm_audit.c

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