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

Merge f856c598 ("bpf: Enforce expected_attach_type for tailcall...


Merge f856c598 ("bpf: Enforce expected_attach_type for tailcall compatibility") into android16-6.12-lts

Steps on the way to 6.12.53

Note, this merges AROUND commit f856c598 ("bpf: Enforce
expected_attach_type for tailcall compatibility") as it breaks the
kernel abi.  If it is needed in the future it can come back in an
abi-safe  way.

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

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