From 7163c5693898fcc221e553454f5dd75d234a0d0d Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Sat, 16 Jul 2022 20:11:08 +0000 Subject: [PATCH] Update to 5.15.55 --- .kernel.metadata | 2 +- SOURCES/fedora-v5.15.patch | 38 ++++++++++++++-------------- SOURCES/linux-honeycomb-5.15.y.patch | 24 +++++++++--------- SPECS/kernel.spec | 5 +++- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.kernel.metadata b/.kernel.metadata index 88c7f38..ed3ed85 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,2 +1,2 @@ ac61f2459040c09af1d5abd4ed100c3d316b443e SOURCES/linux-5.15.tar.xz -a9168c9841b6e1a3d3a0d236b5d719f4852acd42 SOURCES/patch-5.15.48.xz +cc364427ebd3deaf7091e4678acba704ba521604 SOURCES/patch-5.15.55.xz diff --git a/SOURCES/fedora-v5.15.patch b/SOURCES/fedora-v5.15.patch index 84ef1b2..8fdb747 100644 --- a/SOURCES/fedora-v5.15.patch +++ b/SOURCES/fedora-v5.15.patch @@ -513,7 +513,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index fe91090e04a4..f00bc6886913 100644 +index 2badf36d4816..703836cadb4e 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -855,7 +855,7 @@ index e3df82d5d37a..56274356784b 100644 static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 3d8ddc5eca8c..7aad9fc10338 100644 +index d34e8a7ed4d5..43c0667259a6 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -867,7 +867,7 @@ index 3d8ddc5eca8c..7aad9fc10338 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -825,6 +827,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) +@@ -827,6 +829,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) #endif extern int efi_status_to_err(efi_status_t status); @@ -893,10 +893,10 @@ Signed-off-by: Jeremy Cline 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index f290f78c3f30..d3e7ae04f5be 100644 +index 555d2dfc0ff7..5b5a4caec520 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c -@@ -46,7 +46,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -72,7 +72,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, return NULL; if (*status != EFI_BUFFER_TOO_SMALL) { @@ -906,7 +906,7 @@ index f290f78c3f30..d3e7ae04f5be 100644 return NULL; } -@@ -57,7 +58,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, +@@ -83,7 +84,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, *status = efi.get_variable(name, guid, NULL, &lsize, db); if (*status != EFI_SUCCESS) { kfree(db); @@ -1135,10 +1135,10 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/include/linux/efi.h b/include/linux/efi.h -index 7aad9fc10338..779f41901f35 100644 +index 43c0667259a6..580547464acf 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -784,6 +784,14 @@ extern int __init efi_setup_pcdp_console(char *); +@@ -786,6 +786,14 @@ extern int __init efi_setup_pcdp_console(char *); #define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */ #define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */ @@ -1153,7 +1153,7 @@ index 7aad9fc10338..779f41901f35 100644 #ifdef CONFIG_EFI /* -@@ -795,6 +803,8 @@ static inline bool efi_enabled(int feature) +@@ -797,6 +805,8 @@ static inline bool efi_enabled(int feature) } extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); @@ -1162,7 +1162,7 @@ index 7aad9fc10338..779f41901f35 100644 bool __pure __efi_soft_reserve_enabled(void); static inline bool __pure efi_soft_reserve_enabled(void) -@@ -815,6 +825,8 @@ static inline bool efi_enabled(int feature) +@@ -817,6 +827,8 @@ static inline bool efi_enabled(int feature) static inline void efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {} @@ -1171,7 +1171,7 @@ index 7aad9fc10338..779f41901f35 100644 static inline bool efi_soft_reserve_enabled(void) { return false; -@@ -1080,13 +1092,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1082,13 +1094,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); @@ -1306,7 +1306,7 @@ index 5ad1dde23dc5..b6192d58eed3 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index ee67215a678a..931955a9ceca 100644 +index 36c1f31dfd66..b88ca144c581 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -1963,7 +1963,7 @@ Date: Tue Aug 25 21:52:45 2020 -0400 1 file changed, 3 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 87877397d1ad..45190412ccf3 100644 +index 19054b791c67..9ed6fa09b60d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -262,6 +262,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2018,7 +2018,7 @@ Signed-off-by: Mike Snitzer 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 45190412ccf3..92bedbd55fcf 100644 +index 9ed6fa09b60d..e8d56b2bb9f3 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -324,6 +324,7 @@ enum nvme_disposition { @@ -2118,7 +2118,7 @@ Signed-off-by: Mike Snitzer 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 92bedbd55fcf..1a9bfb64a410 100644 +index e8d56b2bb9f3..0149a7fe3092 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -365,6 +365,8 @@ static inline void nvme_end_req(struct request *req) @@ -2378,10 +2378,10 @@ Acked-by: Bjorn Helgaas 5 files changed, 57 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index fd3d14dabadc..01a260ee4acd 100644 +index 9f4f3e2ceea6..a141da629b39 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3954,6 +3954,15 @@ +@@ -3990,6 +3990,15 @@ please report a bug. nocrs [X86] Ignore PCI host bridge windows from ACPI. If you need to use this, please report a bug. @@ -2823,10 +2823,10 @@ index 273117683922..21ec0c3d1d47 100644 if (!(range->flags & NF_NAT_RANGE_PROTO_OFFSET) && l4proto_in_range(tuple, maniptype, diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh -index 781fa2d9ea9d..84805658a3b9 100755 +index 032f2de6e14e..1ba2cba7d580 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh -@@ -867,8 +867,9 @@ EOF +@@ -906,8 +906,9 @@ EOF return $ksft_skip fi diff --git a/SOURCES/linux-honeycomb-5.15.y.patch b/SOURCES/linux-honeycomb-5.15.y.patch index fd58a53..179d03e 100644 --- a/SOURCES/linux-honeycomb-5.15.y.patch +++ b/SOURCES/linux-honeycomb-5.15.y.patch @@ -260,7 +260,7 @@ Signed-off-by: Shameer Kolothum 2 files changed, 42 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index 276b6fcc80ad..9e6977bf930f 100644 +index 48c6f7ff4aef..72d801a5a5f7 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -174,6 +174,35 @@ void iommu_put_dma_cookie(struct iommu_domain *domain) @@ -414,7 +414,7 @@ index 7df83d80819b..66d200e577cb 100644 static int nc_dma_get_range(struct device *dev, u64 *size) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index 9e6977bf930f..5cabcaa97744 100644 +index 72d801a5a5f7..4e4d00a3adaf 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -185,6 +185,9 @@ EXPORT_SYMBOL(iommu_put_dma_cookie); @@ -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 430315135cff..8acc86073953 100644 +index 79edfdca6607..742c015c6616 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 8acc86073953..c1cb83cf2b5b 100644 +index 742c015c6616..2c2e79034f4c 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, @@ -623,7 +623,7 @@ 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 c1cb83cf2b5b..3732cecb6cca 100644 +index 2c2e79034f4c..9b7753d66791 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, @@ -661,7 +661,7 @@ index c1cb83cf2b5b..3732cecb6cca 100644 static int arm_smmu_device_probe(struct platform_device *pdev) { int irq, ret; -@@ -3851,6 +3879,9 @@ static int arm_smmu_device_probe(struct platform_device *pdev) +@@ -3853,6 +3881,9 @@ static int arm_smmu_device_probe(struct platform_device *pdev) /* Record our private device structure */ platform_set_drvdata(pdev, smmu); @@ -694,7 +694,7 @@ Signed-off-by: Shameer Kolothum 1 file changed, 48 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c -index 4bc75c4ce402..6c6b0b97756a 100644 +index 324e8f32962a..1d65dd243fee 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -2066,6 +2066,50 @@ err_reset_platform_ops: __maybe_unused; @@ -748,7 +748,7 @@ index 4bc75c4ce402..6c6b0b97756a 100644 static int arm_smmu_device_probe(struct platform_device *pdev) { struct resource *res; -@@ -2192,6 +2236,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev) +@@ -2191,6 +2235,10 @@ static int arm_smmu_device_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, smmu); @@ -778,7 +778,7 @@ Signed-off-by: Shameer Kolothum 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index 5cabcaa97744..f83426df6f89 100644 +index 4e4d00a3adaf..0014a70597ef 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -207,22 +207,68 @@ void iommu_dma_put_rmrs(struct fwnode_handle *iommu_fwnode, @@ -929,7 +929,7 @@ index 66d200e577cb..c397c980a7f4 100644 region = iommu_alloc_resv_region(addr, size, prot, type); diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c -index f83426df6f89..bdf438bcf2e4 100644 +index 0014a70597ef..2055151cfc3f 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -243,6 +243,7 @@ static void iommu_dma_get_rmr_resv_regions(struct device *dev, @@ -1200,7 +1200,7 @@ Signed-off-by: Meharbaan 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c -index 4c77837769c6..f478a0d10634 100644 +index 735a23db1b5e..1125b79a9ca6 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -17,6 +17,7 @@ @@ -1211,7 +1211,7 @@ index 4c77837769c6..f478a0d10634 100644 struct fwnode_handle *dev_fwnode(struct device *dev) { -@@ -893,6 +894,43 @@ enum dev_dma_attr device_get_dma_attr(struct device *dev) +@@ -915,6 +916,43 @@ enum dev_dma_attr device_get_dma_attr(struct device *dev) } EXPORT_SYMBOL_GPL(device_get_dma_attr); diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 36b8c6a..c5bc97e 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 48 +%define stable_update 55 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -3017,6 +3017,9 @@ fi # # %changelog +* Sat Jul 16 2022 Pablo Greco - 5.15.55-200 +- Update to version v5.15.55 + * Sun Jun 19 2022 Pablo Greco - 5.15.48-200 - Update to version v5.15.48