diff --git a/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch b/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch index c26330d91b..5b49a25c2c 100644 --- a/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch +++ b/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch @@ -28,7 +28,7 @@ Link: https://lore.kernel.org/bpf/20220223012814.1898677-1-connoro@google.com --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c -@@ -6072,7 +6072,8 @@ static int btf_module_notify(struct noti +@@ -6125,7 +6125,8 @@ static int btf_module_notify(struct noti pr_warn("failed to validate module [%s] BTF: %ld\n", mod->name, PTR_ERR(btf)); kfree(btf_mod); diff --git a/target/linux/generic/backport-5.15/621-v6.4-24-wwan-core-Support-slicing-in-port-TX-flow-of-WWAN-subsyst.patch b/target/linux/generic/backport-5.15/621-v6.4-24-wwan-core-Support-slicing-in-port-TX-flow-of-WWAN-subsyst.patch index 80740d40ac..b94bb471bb 100644 --- a/target/linux/generic/backport-5.15/621-v6.4-24-wwan-core-Support-slicing-in-port-TX-flow-of-WWAN-subsyst.patch +++ b/target/linux/generic/backport-5.15/621-v6.4-24-wwan-core-Support-slicing-in-port-TX-flow-of-WWAN-subsyst.patch @@ -256,7 +256,7 @@ Signed-off-by: Jakub Kicinski goto err_free_port; --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c -@@ -933,7 +933,8 @@ static void wdm_wwan_init(struct wdm_dev +@@ -929,7 +929,8 @@ static void wdm_wwan_init(struct wdm_dev return; } diff --git a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch index 6fb01ae0ee..c8f79c5666 100644 --- a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch +++ b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch @@ -83,7 +83,7 @@ Signed-off-by: XiaoDong Huang if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) -@@ -4995,6 +5011,7 @@ static int __init its_probe_one(struct r +@@ -4990,6 +5006,7 @@ static int __init its_probe_one(struct r u64 baser, tmp, typer; struct page *page; int err; @@ -91,7 +91,7 @@ Signed-off-by: XiaoDong Huang its_base = ioremap(res->start, SZ_64K); if (!its_base) { -@@ -5063,7 +5080,10 @@ static int __init its_probe_one(struct r +@@ -5058,7 +5075,10 @@ static int __init its_probe_one(struct r its->numa_node = numa_node; diff --git a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index d54089e2f6..87cb236c3d 100644 --- a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -45,7 +45,7 @@ Signed-off-by: XiaoDong Huang if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { /* * The HW reports non-shareable, we must remove the -@@ -5114,6 +5126,10 @@ static int __init its_probe_one(struct r +@@ -5109,6 +5121,10 @@ static int __init its_probe_one(struct r gits_write_cbaser(baser, its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER); diff --git a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 866e9ab001..c0a6cf86a2 100644 --- a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -42,7 +42,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK; if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { -@@ -5131,7 +5134,8 @@ static int __init its_probe_one(struct r +@@ -5126,7 +5129,8 @@ static int __init its_probe_one(struct r tmp = gits_read_cbaser(its->base + GITS_CBASER); if (of_machine_is_compatible("rockchip,rk3568") ||