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

Merge a99de191 ("bpf: Enforce expected_attach_type for tailcall compatibility") into android14-6.1-lts

Steps on the way to 6.1.156

merges around this commit due to abi issues.  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: I697331323890858839c933a9f3368a12b6b23331
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>