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

Merge 764929ac ("x86/static_call: Add support for Jcc tail-calls") into android14-5.15-lts



Steps on the way to 5.15.154

Resolves merge conflicts in:
	arch/arm64/include/asm/kvm_pgtable.h
	drivers/cpufreq/brcmstb-avs-cpufreq.c
	drivers/iommu/iova.c
	fs/fuse/dir.c
	include/linux/ring_buffer.h

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