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

Merge 0f608ce9 ("PCI/DPC: Quirk PIO log size for Intel Ice Lake Root...


Merge 0f608ce9 ("PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports") into android14-5.15-lts

Steps on the way to 5.15.154

Resolves conflicts in:
	drivers/pci/quirks.c

by merging away commit 0f608ce9 ("PCI/DPC: Quirk PIO log size for
Intel Ice Lake Root Ports") as it is not relevent anymore due to
previous reverts.

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