Skip to content

Commit 4bb5934

Browse files
authored
kernel: 5.19: refresh patches (#9966)
Delete: target/linux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.patch [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.19.y&id=4d8f078e12a8e038ffb9bbb91c5603d6b53ff532
1 parent 3c0774c commit 4bb5934

11 files changed

+11
-44
lines changed

target/linux/generic/backport-5.19/002-struct-net_device.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#endif
3333
--- a/include/net/cfg80211.h
3434
+++ b/include/net/cfg80211.h
35-
@@ -8006,9 +8006,7 @@ int cfg80211_register_netdevice(struct n
35+
@@ -8085,9 +8085,7 @@ int cfg80211_register_netdevice(struct n
3636
*/
3737
static inline void cfg80211_unregister_netdevice(struct net_device *dev)
3838
{

target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
1515

1616
#include "gpiolib.h"
1717
#include "gpiolib-of.h"
18-
@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip *
18+
@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip *
1919
else
2020
gc->of_node = gdev->dev.of_node;
2121
}

target/linux/generic/hack-5.19/904-debloat_dma_buf.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
7373
+MODULE_LICENSE("GPL");
7474
--- a/kernel/sched/core.c
7575
+++ b/kernel/sched/core.c
76-
@@ -4284,6 +4284,7 @@ int wake_up_state(struct task_struct *p,
76+
@@ -4293,6 +4293,7 @@ int wake_up_state(struct task_struct *p,
7777
{
7878
return try_to_wake_up(p, state, 0);
7979
}

target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <[email protected]>
7171

7272
--- a/mm/page_alloc.c
7373
+++ b/mm/page_alloc.c
74-
@@ -7702,7 +7702,7 @@ static void __init alloc_node_mem_map(st
74+
@@ -7698,7 +7698,7 @@ static void __init alloc_node_mem_map(st
7575
if (pgdat == NODE_DATA(0)) {
7676
mem_map = NODE_DATA(0)->node_mem_map;
7777
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
1212

1313
--- a/drivers/mtd/parsers/redboot.c
1414
+++ b/drivers/mtd/parsers/redboot.c
15-
@@ -304,6 +304,7 @@ nogood:
15+
@@ -305,6 +305,7 @@ nogood:
1616

1717
static const struct of_device_id mtd_parser_redboot_of_match_table[] = {
1818
{ .compatible = "redboot-fis" },

target/linux/generic/pending-5.19/420-mtd-redboot_space.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1111

1212
--- a/drivers/mtd/parsers/redboot.c
1313
+++ b/drivers/mtd/parsers/redboot.c
14-
@@ -277,14 +277,21 @@ nogood:
14+
@@ -278,14 +278,21 @@ nogood:
1515
#endif
1616
names += strlen(names) + 1;
1717

target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
9898
#endif /* __LINUX_USB_PCI_QUIRKS_H */
9999
--- a/include/linux/usb/hcd.h
100100
+++ b/include/linux/usb/hcd.h
101-
@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_
101+
@@ -498,7 +498,14 @@ extern int usb_hcd_pci_probe(struct pci_
102102
extern void usb_hcd_pci_remove(struct pci_dev *dev);
103103
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
104104

target/linux/generic/pending-5.19/920-mangle_bootargs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
3131
help
3232
--- a/init/main.c
3333
+++ b/init/main.c
34-
@@ -606,6 +606,29 @@ static inline void setup_nr_cpu_ids(void
34+
@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
3535
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
3636
#endif
3737

@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
6161
/*
6262
* We need to store the untouched command line for future reference.
6363
* We also need to store the touched command line since the parameter
64-
@@ -949,6 +972,7 @@ asmlinkage __visible void __init __no_sa
64+
@@ -950,6 +973,7 @@ asmlinkage __visible void __init __no_sa
6565
pr_notice("%s", linux_banner);
6666
early_security_init();
6767
setup_arch(&command_line);

target/linux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

target/linux/rockchip/patches-5.19/0042-phy-rockchip-inno-usb2-Prevent-incorrect-error-on-pr.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul <[email protected]>
1717

1818
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
1919
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
20-
@@ -1283,7 +1283,7 @@ static int rockchip_usb2phy_probe(struct
20+
@@ -1291,7 +1291,7 @@ static int rockchip_usb2phy_probe(struct
2121

2222
phy = devm_phy_create(dev, child_np, &rockchip_usb2phy_ops);
2323
if (IS_ERR(phy)) {

0 commit comments

Comments
 (0)