diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-04 12:29:33 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-04 12:29:33 -0600 |
| commit | d964bc4b81a299df5333f83c5137139b0c098cf6 (patch) | |
| tree | b578d1964ef2e2692fb999cff0b5d0d81d9b2fe9 | |
| parent | 70e342d8784d7ba744b795c996851da934188591 (diff) | |
| download | kernel-d964bc4b81a299df5333f83c5137139b0c098cf6.tar.gz kernel-d964bc4b81a299df5333f83c5137139b0c098cf6.tar.xz kernel-d964bc4b81a299df5333f83c5137139b0c098cf6.zip | |
kernel-5.11.3-300
* Thu Mar 04 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-300]
- PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar)
- Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson)
- forgot to push this one earlier (Justin M. Forbes)
- Reference the patch as version.patchlevel to more easily see diffs between stable releases (Justin M. Forbes)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
| -rw-r--r-- | Patchlist.changelog | 6 | ||||
| -rwxr-xr-x | kernel.spec | 11 | ||||
| -rw-r--r-- | patch-5.11-redhat.patch (renamed from patch-5.11.3-redhat.patch) | 6 | ||||
| -rw-r--r-- | sources | 4 |
4 files changed, 20 insertions, 7 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index 366f0b84f..63da7b98f 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/8c183d2a65857c77f4cf84cc9821b9b8cc45cfd7 + 8c183d2a65857c77f4cf84cc9821b9b8cc45cfd7 PCI: Add MCFG quirks for Tegra194 host controllers + +https://gitlab.com/cki-project/kernel-ark/-/commit/89525aa6ba3154ad25b133ed683c7701d915a464 + 89525aa6ba3154ad25b133ed683c7701d915a464 Revert "PCI: Add MCFG quirks for Tegra194 host controllers" + https://gitlab.com/cki-project/kernel-ark/-/commit/6f4d37a3597e3ab80a62a6ab62883151d256de40 6f4d37a3597e3ab80a62a6ab62883151d256de40 arm64: dts: rockchip: disable USB type-c DisplayPort diff --git a/kernel.spec b/kernel.spec index 7d2989886..cc70cea50 100755 --- a/kernel.spec +++ b/kernel.spec @@ -105,6 +105,7 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.3 +%define stableversion 5.11 %define pkgrelease 300 # This is needed to do merge window version magic @@ -755,7 +756,7 @@ Source4000: README.rst %if !%{nopatches} -Patch1: patch-%{rpmversion}-redhat.patch +Patch1: patch-%{stableversion}-redhat.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1258,7 +1259,7 @@ cp -a %{SOURCE1} . %if !%{nopatches} -ApplyOptionalPatch patch-%{rpmversion}-redhat.patch +ApplyOptionalPatch patch-%{stableversion}-redhat.patch %endif ApplyOptionalPatch linux-kernel-test.patch @@ -2762,6 +2763,12 @@ fi # # %changelog +* Thu Mar 04 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-300] +- PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar) +- Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson) +- forgot to push this one earlier (Justin M. Forbes) +- Reference the patch as version.patchlevel to more easily see diffs between stable releases (Justin M. Forbes) + * Thu Mar 04 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-5] - arm64: dts: rockchip: disable USB type-c DisplayPort (Jian-Hong Pan) - Build PHY_TEGRA194_P2U and PCIE_TEGRA194_HOST in, not as modules (Peter Robinson) diff --git a/patch-5.11.3-redhat.patch b/patch-5.11-redhat.patch index 3ea9f0c4e..ce3b0044e 100644 --- a/patch-5.11.3-redhat.patch +++ b/patch-5.11-redhat.patch @@ -1537,7 +1537,7 @@ index a751553fa0db..dbb981876556 100644 +obj-$(CONFIG_ARM64) += pcie-tegra194.o endif diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c -index 6fa216e52d14..0a851de769e8 100644 +index 6fa216e52d14..1090a9cfe4f0 100644 --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c @@ -22,6 +22,8 @@ @@ -1632,8 +1632,8 @@ index 6fa216e52d14..0a851de769e8 100644 + type = PCIE_ATU_TYPE_CFG1; + } + -+ program_outbound_atu(pcie, PCIE_ATU_REGION_INDEX0, type, -+ cfg->res.start, busdev, SZ_256K); ++ program_outbound_atu(pcie, 0, type, cfg->res.start, busdev, SZ_256K); ++ + return (void __iomem *)(pcie->config_base + where); +} + @@ -1,3 +1,3 @@ SHA512 (linux-5.11.3.tar.xz) = a383c2502fea39806d545fa8e04d82cc450edefab7d9ba39395d4b3a13809649c9fb771d325a9f68fa566a06077e25fe86938bc9cf452b74d62aede27f4b5646 -SHA512 (kernel-abi-whitelists-5.11.3-300.tar.bz2) = 7e6a66a641a7bb29c58b924a490965db31e2137a7d6c3e16bb74a20782436ce8e4844daf62208cc47e86013cd0ddda5c7b2bea8750a079945a98ab07d11680d6 -SHA512 (kernel-kabi-dw-5.11.3-300.tar.bz2) = d8c86716b89f6b4bf2cea82feed945604e5ee3379e78f316a43edd99d9f4139a8d6d661faa7d03d59051520d103941274cc3015051fa9c5593f16fd46f756df2 +SHA512 (kernel-abi-whitelists-5.11.3-300.tar.bz2) = f8467f89f1ca2535a34417b92a4407737002534a63af568c88fd68484132072679ece930b1918aa2f2ecb02da17ae5a4c7d318e82c22f9c48402781028f0944b +SHA512 (kernel-kabi-dw-5.11.3-300.tar.bz2) = 3b24f379d27492a69ca96a48c4a4523035af3c61bdd23e33cb768d0157104b61c7f3bfb5e82999630a282eddb43ec00a338f672abd6f638708e29a35effa8539 |