diff --git a/target/linux/generic/backport-5.19/002-struct-net_device.patch b/target/linux/generic/backport-5.19/002-struct-net_device.patch index 6d6cf20af..1a2e54da9 100644 --- a/target/linux/generic/backport-5.19/002-struct-net_device.patch +++ b/target/linux/generic/backport-5.19/002-struct-net_device.patch @@ -32,7 +32,7 @@ #endif --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -8006,9 +8006,7 @@ int cfg80211_register_netdevice(struct n +@@ -8085,9 +8085,7 @@ int cfg80211_register_netdevice(struct n */ static inline void cfg80211_unregister_netdevice(struct net_device *dev) { diff --git a/target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch index 6ed20176d..898bd53cb 100644 --- a/target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch +++ b/target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch @@ -15,7 +15,7 @@ Signed-off-by: John Crispin #include "gpiolib.h" #include "gpiolib-of.h" -@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip * +@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip * else gc->of_node = gdev->dev.of_node; } diff --git a/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch index 5163d5f38..bab1b22f6 100644 --- a/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4284,6 +4284,7 @@ int wake_up_state(struct task_struct *p, +@@ -4293,6 +4293,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 3bdfb9baa..7adb2c7be 100644 --- a/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -7702,7 +7702,7 @@ static void __init alloc_node_mem_map(st +@@ -7698,7 +7698,7 @@ static void __init alloc_node_mem_map(st if (pgdat == NODE_DATA(0)) { mem_map = NODE_DATA(0)->node_mem_map; if (page_to_pfn(mem_map) != pgdat->node_start_pfn) diff --git a/target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch index 3d176f856..ade36033d 100644 --- a/target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch +++ b/target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -304,6 +304,7 @@ nogood: +@@ -305,6 +305,7 @@ nogood: static const struct of_device_id mtd_parser_redboot_of_match_table[] = { { .compatible = "redboot-fis" }, diff --git a/target/linux/generic/pending-5.19/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.19/420-mtd-redboot_space.patch index fee193659..5518ea71d 100644 --- a/target/linux/generic/pending-5.19/420-mtd-redboot_space.patch +++ b/target/linux/generic/pending-5.19/420-mtd-redboot_space.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -277,14 +277,21 @@ nogood: +@@ -278,14 +278,21 @@ nogood: #endif names += strlen(names) + 1; diff --git a/target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch index 67406bac8..b498d9f70 100644 --- a/target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -498,7 +498,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/pending-5.19/920-mangle_bootargs.patch b/target/linux/generic/pending-5.19/920-mangle_bootargs.patch index e83247b8a..30d5de253 100644 --- a/target/linux/generic/pending-5.19/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.19/920-mangle_bootargs.patch @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz help --- a/init/main.c +++ b/init/main.c -@@ -606,6 +606,29 @@ static inline void setup_nr_cpu_ids(void +@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -949,6 +972,7 @@ asmlinkage __visible void __init __no_sa +@@ -950,6 +973,7 @@ asmlinkage __visible void __init __no_sa pr_notice("%s", linux_banner); early_security_init(); setup_arch(&command_line); diff --git a/target/linux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.patch b/target/linux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.patch deleted file mode 100644 index 4bc1c5b6c..000000000 --- a/target/linux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.patch +++ /dev/null @@ -1,33 +0,0 @@ -From efaa0a55ce429107697f641921336cc51518693a Mon Sep 17 00:00:00 2001 -From: Brian Norris -Date: Fri, 17 Jun 2022 17:26:52 -0700 -Subject: [PATCH 39/51] drm/rockchip: vop: Don't crash for invalid - duplicate_state() - -It's possible for users to try to duplicate the CRTC state even when the -state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other -users of __drm_atomic_helper_crtc_duplicate_state()) already guard this -with a WARN_ON() instead of crashing, so let's do that here too. - -Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config") -Signed-off-by: Brian Norris -Reviewed-by: Sean Paul -Reviewed-by: Douglas Anderson -Signed-off-by: Heiko Stuebner -Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid ---- - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -@@ -1570,6 +1570,9 @@ static struct drm_crtc_state *vop_crtc_d - { - struct rockchip_crtc_state *rockchip_state; - -+ if (WARN_ON(!crtc->state)) -+ return NULL; -+ - rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); - if (!rockchip_state) - return NULL; diff --git a/target/linux/rockchip/patches-5.19/0042-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-pr.patch b/target/linux/rockchip/patches-5.19/0042-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-pr.patch index 09ce9f00a..429d33f41 100644 --- a/target/linux/rockchip/patches-5.19/0042-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-pr.patch +++ b/target/linux/rockchip/patches-5.19/0042-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-pr.patch @@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -@@ -1283,7 +1283,7 @@ static int rockchip_usb2phy_probe(struct +@@ -1291,7 +1291,7 @@ static int rockchip_usb2phy_probe(struct phy = devm_phy_create(dev, child_np, &rockchip_usb2phy_ops); if (IS_ERR(phy)) { diff --git a/target/linux/rockchip/patches-5.19/0903-crypto-rockchip-permit-to-pass-self-tests.patch b/target/linux/rockchip/patches-5.19/0903-crypto-rockchip-permit-to-pass-self-tests.patch index 5be8c13e2..6710b0efb 100644 --- a/target/linux/rockchip/patches-5.19/0903-crypto-rockchip-permit-to-pass-self-tests.patch +++ b/target/linux/rockchip/patches-5.19/0903-crypto-rockchip-permit-to-pass-self-tests.patch @@ -2165,7 +2165,7 @@ Signed-off-by: Corentin Labbe depends on ZYNQMP_FIRMWARE || COMPILE_TEST --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17300,6 +17300,13 @@ F: Documentation/ABI/*/sysfs-driver-hid- +@@ -17295,6 +17295,13 @@ F: Documentation/ABI/*/sysfs-driver-hid- F: drivers/hid/hid-roccat* F: include/linux/hid-roccat*