From: Bjorn Helgaas Date: Wed, 5 Oct 2022 22:32:56 +0000 (-0500) Subject: Merge branch 'remotes/lorenzo/pci/mediatek' X-Git-Tag: v6.1-rc1~51^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cb0a666998ddc5c2ca9c5dcaf916dd48c4eef0c;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'remotes/lorenzo/pci/mediatek' - Rename the pcie-mediatek-gen3 driver from 'mtk-pcie' to 'mtk-pcie-gen3' so it can coexist with the pcie-mediatek driver, which also uses 'mtk-pcie' (Felix Fietkau) * remotes/lorenzo/pci/mediatek: PCI: mediatek-gen3: Change driver name to mtk-pcie-gen3 --- 7cb0a666998ddc5c2ca9c5dcaf916dd48c4eef0c