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

Merge 08cb3dc9 ("bpf: Enforce expected_attach_type for tailcall...


Merge 08cb3dc9 ("bpf: Enforce expected_attach_type for tailcall compatibility") into android15-6.6-lts

Steps on the way to 6.6.112

Merges around commit 08cb3dc9 ("bpf: Enforce expected_attach_type
for tailcall compatibility") as it breaks the kernel abi.  It can come
back in the future in an abi-safe way if needed.

Resolves merge conflicts in:
	include/linux/bpf.h
	kernel/bpf/core.c

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