From c57d7bc99f6a7e141eba537cfd5d99a0c2146168 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 28 Nov 2022 00:44:25 +0000 Subject: [PATCH] Update to 5.15.80 --- .kernel.metadata | 2 +- SOURCES/fedora-v5.15.patch | 2 +- SOURCES/kernel-aarch64-debug-fedora.config | 2 ++ SOURCES/kernel-aarch64-fedora.config | 2 ++ SOURCES/linux-honeycomb-5.15.y.patch | 12 ++++++------ SPECS/kernel.spec | 5 ++++- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.kernel.metadata b/.kernel.metadata index a7143c8..493bc36 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,2 +1,2 @@ ac61f2459040c09af1d5abd4ed100c3d316b443e SOURCES/linux-5.15.tar.xz -494c9936b6ae0b5f845fe80e2ac99d14c9e32e66 SOURCES/patch-5.15.74.xz +bf6af28b5d342790975e9a5a899e8a91b484b403 SOURCES/patch-5.15.80.xz diff --git a/SOURCES/fedora-v5.15.patch b/SOURCES/fedora-v5.15.patch index 95af3f9..fcc7073 100644 --- a/SOURCES/fedora-v5.15.patch +++ b/SOURCES/fedora-v5.15.patch @@ -2276,7 +2276,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/b index 9e5d07f5712e..dae8c252bc2b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -@@ -707,7 +707,7 @@ +@@ -707,7 +707,7 @@ fusb0: fusb30x@22 { connector { compatible = "usb-c-connector"; diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index 33e3333..814b480 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -331,6 +331,8 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1742098=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 54b6122..b557de4 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -331,6 +331,8 @@ CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1742098=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/SOURCES/linux-honeycomb-5.15.y.patch b/SOURCES/linux-honeycomb-5.15.y.patch index ba53a43..511b435 100644 --- a/SOURCES/linux-honeycomb-5.15.y.patch +++ b/SOURCES/linux-honeycomb-5.15.y.patch @@ -479,7 +479,7 @@ Signed-off-by: Shameer Kolothum 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -index 79edfdca6607..742c015c6616 100644 +index e7da4a47ce52..4a8c2f5158ea 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2530,6 +2530,19 @@ static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) @@ -554,7 +554,7 @@ Signed-off-by: Shameer Kolothum 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -index 742c015c6616..2c2e79034f4c 100644 +index 4a8c2f5158ea..ce47559cfca7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1374,12 +1374,21 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, @@ -590,7 +590,7 @@ index 742c015c6616..2c2e79034f4c 100644 arm_smmu_write_strtab_l1_desc(strtab, desc); return 0; } -@@ -3054,7 +3063,7 @@ static int arm_smmu_init_strtab_linear(struct arm_smmu_device *smmu) +@@ -3075,7 +3084,7 @@ static int arm_smmu_init_strtab_linear(struct arm_smmu_device *smmu) reg |= FIELD_PREP(STRTAB_BASE_CFG_LOG2SIZE, smmu->sid_bits); cfg->strtab_base_cfg = reg; @@ -623,10 +623,10 @@ Signed-off-by: Shameer Kolothum 1 file changed, 31 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -index 2c2e79034f4c..9b7753d66791 100644 +index ce47559cfca7..dbddb5ea2321 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -@@ -3770,6 +3770,34 @@ static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, +@@ -3791,6 +3791,34 @@ static void __iomem *arm_smmu_ioremap(struct device *dev, resource_size_t start, return devm_ioremap_resource(dev, &res); } @@ -661,7 +661,7 @@ index 2c2e79034f4c..9b7753d66791 100644 static int arm_smmu_device_probe(struct platform_device *pdev) { int irq, ret; -@@ -3853,6 +3881,9 @@ static int arm_smmu_device_probe(struct platform_device *pdev) +@@ -3874,6 +3902,9 @@ static int arm_smmu_device_probe(struct platform_device *pdev) /* Record our private device structure */ platform_set_drvdata(pdev, smmu); diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 0118584..857dd6b 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -97,7 +97,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 74 +%define stable_update 80 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -3017,6 +3017,9 @@ fi # # %changelog +* Sun Nov 27 2022 Pablo Greco - 5.15.80-200 +- Update to version v5.15.80 + * Sat Oct 15 2022 Pablo Greco - 5.15.74-200 - Update to version v5.15.74