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

Merge 8cc4da21 ("block: fix 'kmem_cache of name 'bio-108' already...


Merge 8cc4da21 ("block: fix 'kmem_cache of name 'bio-108' already exists'") into android14-6.1-lts

Steps on the way to 6.1.132

Resolves merge conflicts in:

	kernel/sched/core.c

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