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

Merge f654b258 ("bpf: Pack struct bpf_fib_lookup") into android14-5.15-lts



Steps on the way to 5.15.161

Resolves merge conflicts in:
	kernel/sched/fair.c

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