mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
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
This commit is contained in:
parent
3c0774cf8f
commit
4bb5934fee
@ -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)
|
||||
{
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
|
||||
#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;
|
||||
}
|
||||
|
@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
+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);
|
||||
}
|
||||
|
@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
||||
|
||||
--- 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)
|
||||
|
@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
|
||||
--- 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" },
|
||||
|
@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- 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;
|
||||
|
||||
|
@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#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);
|
||||
|
||||
|
@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
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 <kaloz@openwrt.org>
|
||||
/*
|
||||
* 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);
|
||||
|
@ -1,33 +0,0 @@
|
||||
From efaa0a55ce429107697f641921336cc51518693a Mon Sep 17 00:00:00 2001
|
||||
From: Brian Norris <briannorris@chromium.org>
|
||||
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 <briannorris@chromium.org>
|
||||
Reviewed-by: Sean Paul <seanpaul@chromium.org>
|
||||
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
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;
|
@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
|
||||
--- 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)) {
|
||||
|
@ -2165,7 +2165,7 @@ Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
||||
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*
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user