diff options
| author | John Audia <therealgraysky@proton.me> | 2023-02-15 14:05:27 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-02-18 19:31:16 +0100 |
| commit | 55a48b095723451beeb4e86e0fd255034c196afb (patch) | |
| tree | 1a898252e9e9b1b69dc50f44ddd9c850ae3635e5 /target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch | |
| parent | a66e53d8ed56ccd6a20f833084c0217b8fa6bd75 (diff) | |
| download | upstream-55a48b095723451beeb4e86e0fd255034c196afb.tar.gz upstream-55a48b095723451beeb4e86e0fd255034c196afb.tar.bz2 upstream-55a48b095723451beeb4e86e0fd255034c196afb.zip | |
kernel: bump 5.10 to 5.10.168
Manually rebased:
backport-5.10/804-v5.14-0001-nvmem-core-allow-specifying-of_node.patch
Removed upstreamed:
generic-backport/807-v5.17-0003-nvmem-core-Fix-a-conflict-between-MTD-and-NVMEM-on-w.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.168&id=34ec4c7831c416ac56619477f1701986634a7efc
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 461072fc7b3d8fa77347a884fe5d36c81f660da8)
[Refresh on OpenWrt 22.03]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch b/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch index b5e43f76b2..ad36850532 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch @@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> #ifdef CONFIG_DRM_VC4_HDMI_CEC static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv) { -@@ -2305,7 +2317,7 @@ static int vc4_hdmi_bind(struct device * +@@ -2306,7 +2318,7 @@ static int vc4_hdmi_bind(struct device * ret = vc4_hdmi_cec_init(vc4_hdmi); if (ret) @@ -92,7 +92,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> ret = vc4_hdmi_audio_init(vc4_hdmi); if (ret) -@@ -2319,6 +2331,8 @@ static int vc4_hdmi_bind(struct device * +@@ -2320,6 +2332,8 @@ static int vc4_hdmi_bind(struct device * err_free_cec: vc4_hdmi_cec_exit(vc4_hdmi); @@ -101,7 +101,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> err_destroy_conn: vc4_hdmi_connector_destroy(&vc4_hdmi->connector); err_destroy_encoder: -@@ -2360,6 +2374,7 @@ static void vc4_hdmi_unbind(struct devic +@@ -2361,6 +2375,7 @@ static void vc4_hdmi_unbind(struct devic kfree(vc4_hdmi->hd_regset.regs); vc4_hdmi_cec_exit(vc4_hdmi); |