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

Merge cde43031 ("scsi: qla2xxx: validate nvme_local_port correctly") into android13-5.15-lts 



Steps on the way to 5.15.165

Resolve merge conflicts in:
	sound/usb/mixer.c
	sound/usb/quirks.c

Change-Id: I5bb5c079dce6e9d4866f00bd5616b72d37d2802a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b1ff7bb2 cde43031
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