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>

15 files changed, 35 insertions, 35 deletions

diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
index dd9582463d..7ef128a2d2 100644
--- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
@@ -118,7 +118,7 @@
  
 --- a/include/uapi/linux/ip.h
 +++ b/include/uapi/linux/ip.h
-@@ -105,7 +105,7 @@ struct iphdr {
+@@ -106,7 +106,7 @@ struct iphdr {
  		__be32	daddr;
  	);
  	/*The options start here. */
@@ -129,7 +129,7 @@
  struct ip_auth_hdr {
 --- a/include/uapi/linux/ipv6.h
 +++ b/include/uapi/linux/ipv6.h
-@@ -134,7 +134,7 @@ struct ipv6hdr {
+@@ -135,7 +135,7 @@ struct ipv6hdr {
  		struct	in6_addr	saddr;
  		struct	in6_addr	daddr;
  	);
diff --git a/target/linux/bcm27xx/patches-5.10/950-0028-mm-Remove-the-PFN-busy-warning.patch b/target/linux/bcm27xx/patches-5.10/950-0028-mm-Remove-the-PFN-busy-warning.patch
index bd75f7e762..e4015d3a85 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0028-mm-Remove-the-PFN-busy-warning.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0028-mm-Remove-the-PFN-busy-warning.patch
@@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -8652,8 +8652,6 @@ int alloc_contig_range(unsigned long sta
+@@ -8655,8 +8655,6 @@ int alloc_contig_range(unsigned long sta
  
  	/* Make sure the range is really isolated. */
  	if (test_pages_isolated(outer_start, end, 0)) {
diff --git a/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch b/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch
index 0f62612355..feac458184 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0310-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch
@@ -20,9 +20,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 -		return 0;
 -
  	vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
- 						  vc4_hdmi, "vc4",
- 						  CEC_CAP_DEFAULTS |
-@@ -1922,7 +1919,6 @@ static const struct vc4_hdmi_variant bcm
+ 						  vc4_hdmi,
+ 						  vc4_hdmi->variant->card_name,
+@@ -1923,7 +1920,6 @@ static const struct vc4_hdmi_variant bcm
  	.debugfs_name		= "hdmi_regs",
  	.card_name		= "vc4-hdmi",
  	.max_pixel_clock	= 162000000,
diff --git a/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch b/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch
index 7c5fee900d..2c8228a755 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0349-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch
@@ -29,7 +29,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  	return 0;
  }
-@@ -1736,6 +1742,7 @@ static int vc5_hdmi_init_resources(struc
+@@ -1737,6 +1743,7 @@ static int vc5_hdmi_init_resources(struc
  	struct platform_device *pdev = vc4_hdmi->pdev;
  	struct device *dev = &pdev->dev;
  	struct resource *res;
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi");
  	if (!res)
-@@ -1826,6 +1833,38 @@ static int vc5_hdmi_init_resources(struc
+@@ -1827,6 +1834,38 @@ static int vc5_hdmi_init_resources(struc
  		return PTR_ERR(vc4_hdmi->reset);
  	}
  
diff --git a/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch b/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
index c08d52ad96..cb76e1995e 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0457-drm-vc4-hdmi-Introduce-a-CEC-clock.patch
@@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT;
  	HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
  }
-@@ -1869,6 +1869,7 @@ static int vc4_hdmi_init_resources(struc
+@@ -1870,6 +1870,7 @@ static int vc4_hdmi_init_resources(struc
  		return PTR_ERR(vc4_hdmi->hsm_clock);
  	}
  	vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock;
@@ -35,7 +35,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
  	return 0;
  }
-@@ -1963,6 +1964,12 @@ static int vc5_hdmi_init_resources(struc
+@@ -1964,6 +1965,12 @@ static int vc5_hdmi_init_resources(struc
  		return PTR_ERR(vc4_hdmi->audio_clock);
  	}
  
diff --git a/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch b/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch
index 8c399b6c79..1ca7c55cb0 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0459-drm-vc4-hdmi-Support-BCM2711-CEC-interrupt-setup.patch
@@ -34,7 +34,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  		HDMI_WRITE(HDMI_CEC_CNTRL_5, val |
  			   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
  	}
-@@ -1799,8 +1801,6 @@ static int vc4_hdmi_cec_init(struct vc4_
+@@ -1800,8 +1802,6 @@ static int vc4_hdmi_cec_init(struct vc4_
  	cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector);
  	cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info);
  
@@ -43,7 +43,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  	value = HDMI_READ(HDMI_CEC_CNTRL_1);
  	/* Set the logical address to Unregistered */
  	value |= VC4_HDMI_CEC_ADDR_MASK;
-@@ -1808,12 +1808,32 @@ static int vc4_hdmi_cec_init(struct vc4_
+@@ -1809,12 +1809,32 @@ static int vc4_hdmi_cec_init(struct vc4_
  
  	vc4_hdmi_cec_update_clk_div(vc4_hdmi);
  
@@ -82,7 +82,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  	ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev);
  	if (ret < 0)
-@@ -2288,6 +2308,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2289,6 +2309,7 @@ static const struct vc4_hdmi_variant bcm
  		PHY_LANE_CK,
  	},
  	.unsupported_odd_h_timings	= true,
@@ -90,7 +90,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  	.init_resources		= vc5_hdmi_init_resources,
  	.csc_setup		= vc5_hdmi_csc_setup,
-@@ -2314,6 +2335,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2315,6 +2336,7 @@ static const struct vc4_hdmi_variant bcm
  		PHY_LANE_2,
  	},
  	.unsupported_odd_h_timings	= true,
diff --git a/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch b/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch
index cbace63037..22f2b3f934 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0460-drm-vc4-hdmi-Don-t-register-the-CEC-adapter-if-there.patch
@@ -33,5 +33,5 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 +	}
 +
  	vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
- 						  vc4_hdmi, "vc4",
- 						  CEC_CAP_DEFAULTS |
+ 						  vc4_hdmi,
+ 						  vc4_hdmi->variant->card_name,
diff --git a/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch b/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch
index 3f12827405..fe00de1ec8 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0475-drm-vc4-Add-HDR-metadata-property-to-the-VC5-HDMI-co.patch
@@ -61,7 +61,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  }
  
  static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
-@@ -2298,6 +2323,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2299,6 +2324,7 @@ static const struct vc4_hdmi_variant bcm
  	.phy_rng_enable		= vc4_hdmi_phy_rng_enable,
  	.phy_rng_disable	= vc4_hdmi_phy_rng_disable,
  	.channel_map		= vc4_hdmi_channel_map,
@@ -69,7 +69,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  };
  
  static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
-@@ -2325,6 +2351,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2326,6 +2352,7 @@ static const struct vc4_hdmi_variant bcm
  	.phy_rng_enable		= vc5_hdmi_phy_rng_enable,
  	.phy_rng_disable	= vc5_hdmi_phy_rng_disable,
  	.channel_map		= vc5_hdmi_channel_map,
@@ -77,7 +77,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  };
  
  static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
-@@ -2352,6 +2379,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2353,6 +2380,7 @@ static const struct vc4_hdmi_variant bcm
  	.phy_rng_enable		= vc5_hdmi_phy_rng_enable,
  	.phy_rng_disable	= vc5_hdmi_phy_rng_disable,
  	.channel_map		= vc5_hdmi_channel_map,
diff --git a/target/linux/bcm27xx/patches-5.10/950-0601-drm-vc4-hdmi-Rely-on-interrupts-to-handle-hotplug.patch b/target/linux/bcm27xx/patches-5.10/950-0601-drm-vc4-hdmi-Rely-on-interrupts-to-handle-hotplug.patch
index a193b4d6f2..981b11ad8b 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0601-drm-vc4-hdmi-Rely-on-interrupts-to-handle-hotplug.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0601-drm-vc4-hdmi-Rely-on-interrupts-to-handle-hotplug.patch
@@ -65,7 +65,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)
  {
-@@ -2317,6 +2357,10 @@ static int vc4_hdmi_bind(struct device *
+@@ -2318,6 +2358,10 @@ static int vc4_hdmi_bind(struct device *
  	if (ret)
  		goto err_destroy_encoder;
  
diff --git a/target/linux/bcm27xx/patches-5.10/950-0602-drm-vc4-hdmi-Add-a-workqueue-to-set-scrambling.patch b/target/linux/bcm27xx/patches-5.10/950-0602-drm-vc4-hdmi-Add-a-workqueue-to-set-scrambling.patch
index 2d5b39f858..cd5a74b06b 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0602-drm-vc4-hdmi-Add-a-workqueue-to-set-scrambling.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0602-drm-vc4-hdmi-Add-a-workqueue-to-set-scrambling.patch
@@ -70,7 +70,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
  					       struct drm_atomic_state *state)
  {
-@@ -2275,6 +2299,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -2276,6 +2300,7 @@ static int vc4_hdmi_bind(struct device *
  	vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL);
  	if (!vc4_hdmi)
  		return -ENOMEM;
diff --git a/target/linux/bcm27xx/patches-5.10/950-0654-drm-vc4-hdmi-Use-a-fixed-rate-for-the-HSM-clock-on-B.patch b/target/linux/bcm27xx/patches-5.10/950-0654-drm-vc4-hdmi-Use-a-fixed-rate-for-the-HSM-clock-on-B.patch
index 36dcc7475c..fc73a7e42e 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0654-drm-vc4-hdmi-Use-a-fixed-rate-for-the-HSM-clock-on-B.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0654-drm-vc4-hdmi-Use-a-fixed-rate-for-the-HSM-clock-on-B.patch
@@ -102,7 +102,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
  {
  	int i;
-@@ -2336,6 +2353,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2337,6 +2354,7 @@ static const struct vc4_hdmi_variant bcm
  	.phy_disable		= vc4_hdmi_phy_disable,
  	.phy_rng_enable		= vc4_hdmi_phy_rng_enable,
  	.phy_rng_disable	= vc4_hdmi_phy_rng_disable,
@@ -110,7 +110,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	.channel_map		= vc4_hdmi_channel_map,
  	.supports_hdr		= false,
  };
-@@ -2364,6 +2382,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2365,6 +2383,7 @@ static const struct vc4_hdmi_variant bcm
  	.phy_disable		= vc5_hdmi_phy_disable,
  	.phy_rng_enable		= vc5_hdmi_phy_rng_enable,
  	.phy_rng_disable	= vc5_hdmi_phy_rng_disable,
@@ -118,7 +118,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	.channel_map		= vc5_hdmi_channel_map,
  	.supports_hdr		= true,
  };
-@@ -2392,6 +2411,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2393,6 +2412,7 @@ static const struct vc4_hdmi_variant bcm
  	.phy_disable		= vc5_hdmi_phy_disable,
  	.phy_rng_enable		= vc5_hdmi_phy_rng_enable,
  	.phy_rng_disable	= vc5_hdmi_phy_rng_disable,
diff --git a/target/linux/bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch b/target/linux/bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch
index 4c3f170067..6582a31a91 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch
@@ -25,7 +25,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1896,25 +1896,23 @@ static int vc4_hdmi_cec_init(struct vc4_
+@@ -1897,25 +1897,23 @@ static int vc4_hdmi_cec_init(struct vc4_
  	vc4_hdmi_cec_update_clk_div(vc4_hdmi);
  
  	if (vc4_hdmi->variant->external_irq_controller) {
@@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  						vc4_cec_irq_handler,
  						vc4_cec_irq_handler_thread, 0,
  						"vc4 hdmi cec", vc4_hdmi);
-@@ -1924,10 +1922,20 @@ static int vc4_hdmi_cec_init(struct vc4_
+@@ -1925,10 +1923,20 @@ static int vc4_hdmi_cec_init(struct vc4_
  
  	ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev);
  	if (ret < 0)
@@ -77,7 +77,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  err_delete_cec_adap:
  	cec_delete_adapter(vc4_hdmi->cec_adap);
  
-@@ -1936,6 +1944,15 @@ err_delete_cec_adap:
+@@ -1937,6 +1945,15 @@ err_delete_cec_adap:
  
  static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi)
  {
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);
diff --git a/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch b/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch
index 8f5b96541e..4489ca2d78 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch
@@ -18,7 +18,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2295,6 +2295,18 @@ static int vc4_hdmi_bind(struct device *
+@@ -2296,6 +2296,18 @@ static int vc4_hdmi_bind(struct device *
  	if (ret)
  		goto err_put_ddc;
  
@@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	if (vc4_hdmi->variant->reset)
  		vc4_hdmi->variant->reset(vc4_hdmi);
  
-@@ -2306,8 +2318,6 @@ static int vc4_hdmi_bind(struct device *
+@@ -2307,8 +2319,6 @@ static int vc4_hdmi_bind(struct device *
  		clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
  	}
  
@@ -46,7 +46,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
  	drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs);
  
-@@ -2331,6 +2341,8 @@ static int vc4_hdmi_bind(struct device *
+@@ -2332,6 +2342,8 @@ static int vc4_hdmi_bind(struct device *
  			     vc4_hdmi_debugfs_regs,
  			     vc4_hdmi);
  
@@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	return 0;
  
  err_free_cec:
-@@ -2341,6 +2353,7 @@ err_destroy_conn:
+@@ -2342,6 +2354,7 @@ err_destroy_conn:
  	vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
  err_destroy_encoder:
  	drm_encoder_cleanup(encoder);
diff --git a/target/linux/generic/pending-5.10/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.10/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
index e00382149a..1adfd22e87 100644
--- a/target/linux/generic/pending-5.10/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ b/target/linux/generic/pending-5.10/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7104,7 +7104,7 @@ static void __ref alloc_node_mem_map(str
+@@ -7107,7 +7107,7 @@ static void __ref alloc_node_mem_map(str
  	if (pgdat == NODE_DATA(0)) {
  		mem_map = NODE_DATA(0)->node_mem_map;
  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn)