Skip to content

Commit

Permalink
kernel: 5.19: refresh patches (coolsnowwolf#9966)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
benihi authored Aug 17, 2022
1 parent 3c0774c commit 4bb5934
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>

#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;
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.19/904-debloat_dma_buf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
+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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <[email protected]>

--- 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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>

--- 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" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- 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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#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);

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/pending-5.19/920-mangle_bootargs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
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

Expand Down Expand Up @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
/*
* 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);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul <[email protected]>

--- 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)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2165,7 +2165,7 @@ Signed-off-by: Corentin Labbe <[email protected]>
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*

Expand Down

0 comments on commit 4bb5934

Please sign in to comment.