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

Merge 71446b65 ("scsi: pm8001: Do not overwrite PCI queue mapping") into android14-6.1-lts 



Steps on the way to 6.1.113

Resolves merge conflicts in:
	kernel/jump_label.c

Change-Id: Ibd4d6563350488956bd310e499467554ce495341
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fbffc436 71446b65
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment