kernel: bump 6.1 to 6.1.84

Removed upstreamed:
   pistachio/patches-6.1/110-pwm-img-fix-clock-lookup.patch [1]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.84&id=44b6fb6cdedb2c391a2da355521d4610b2645fcc

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

28 files changed, 61 insertions, 100 deletions

diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 101dbf34fa..7ea1f9e02d 100644
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .83
-LINUX_KERNEL_HASH-6.1.83 = 88b69611093613ce4494527685f833af0c31b986dcbeda7086f69f18f9e0b190
+LINUX_VERSION-6.1 = .84
+LINUX_KERNEL_HASH-6.1.84 = af97d2ebe14765d0db3af6560309daf08535da25bfad36e5fb3e436f22a1707a
diff --git a/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch b/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch
index 9cdbe6d7c8..67c1e18266 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch
@@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  }
  EXPORT_SYMBOL(drm_panel_init);
  
-@@ -289,16 +292,18 @@ int of_drm_get_panel_orientation(const s
+@@ -294,16 +297,18 @@ int of_drm_get_panel_orientation(const s
  	if (ret < 0)
  		return ret;
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch
index f8ab3b04a1..ab145eb66f 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch
@@ -1185,7 +1185,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  }
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5677,7 +5677,7 @@ static void port_event(struct usb_hub *h
+@@ -5686,7 +5686,7 @@ static void port_event(struct usb_hub *h
  		port_dev->over_current_count++;
  		port_over_current_notify(port_dev);
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
index a89940dacb..6ca3493e4c 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static inline int mmc_blk_part_switch(struct mmc_card *card,
  				      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -3050,6 +3057,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3052,6 +3059,8 @@ static int mmc_blk_probe(struct mmc_card
  {
  	struct mmc_blk_data *md;
  	int ret = 0;
@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -3057,7 +3066,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3059,7 +3068,16 @@ static int mmc_blk_probe(struct mmc_card
  	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
  		return -ENODEV;
  
@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -3072,6 +3090,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3074,6 +3092,17 @@ static int mmc_blk_probe(struct mmc_card
  		goto out_free;
  	}
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch b/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
index ec5a217c7c..ba8d2beed1 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
@@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1773,7 +1773,7 @@ int vchiq_mmal_component_enable(struct v
+@@ -1774,7 +1774,7 @@ int vchiq_mmal_component_enable(struct v
  
  	ret = enable_component(instance, component);
  	if (ret == 0)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch b/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
index 743c757dd5..01a4d49fae 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
@@ -234,7 +234,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  /* deals with receipt of buffer to host message */
  static void buffer_to_host_cb(struct vchiq_mmal_instance *instance,
  			      struct mmal_msg *msg, u32 msg_len)
-@@ -1330,6 +1423,7 @@ static int port_disable(struct vchiq_mma
+@@ -1331,6 +1424,7 @@ static int port_disable(struct vchiq_mma
  				mmalbuf->mmal_flags = 0;
  				mmalbuf->dts = MMAL_TIME_UNKNOWN;
  				mmalbuf->pts = MMAL_TIME_UNKNOWN;
@@ -242,7 +242,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  				port->buffer_cb(instance,
  						port, 0, mmalbuf);
  			}
-@@ -1631,6 +1725,43 @@ int mmal_vchi_buffer_cleanup(struct mmal
+@@ -1632,6 +1726,43 @@ int mmal_vchi_buffer_cleanup(struct mmal
  }
  EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
  
@@ -286,7 +286,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  /* Initialise a mmal component and its ports
   *
   */
-@@ -1680,6 +1811,7 @@ int vchiq_mmal_component_init(struct vch
+@@ -1681,6 +1812,7 @@ int vchiq_mmal_component_init(struct vch
  	ret = port_info_get(instance, &component->control);
  	if (ret < 0)
  		goto release_component;
@@ -294,7 +294,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  
  	for (idx = 0; idx < component->inputs; idx++) {
  		component->input[idx].type = MMAL_PORT_TYPE_INPUT;
-@@ -1690,6 +1822,7 @@ int vchiq_mmal_component_init(struct vch
+@@ -1691,6 +1823,7 @@ int vchiq_mmal_component_init(struct vch
  		ret = port_info_get(instance, &component->input[idx]);
  		if (ret < 0)
  			goto release_component;
@@ -302,7 +302,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  	}
  
  	for (idx = 0; idx < component->outputs; idx++) {
-@@ -1701,6 +1834,7 @@ int vchiq_mmal_component_init(struct vch
+@@ -1702,6 +1835,7 @@ int vchiq_mmal_component_init(struct vch
  		ret = port_info_get(instance, &component->output[idx]);
  		if (ret < 0)
  			goto release_component;
@@ -310,7 +310,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  	}
  
  	for (idx = 0; idx < component->clocks; idx++) {
-@@ -1712,6 +1846,7 @@ int vchiq_mmal_component_init(struct vch
+@@ -1713,6 +1847,7 @@ int vchiq_mmal_component_init(struct vch
  		ret = port_info_get(instance, &component->clock[idx]);
  		if (ret < 0)
  			goto release_component;
@@ -318,7 +318,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  	}
  
  	*component_out = component;
-@@ -1737,7 +1872,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
+@@ -1738,7 +1873,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
  int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
  				  struct vchiq_mmal_component *component)
  {
@@ -327,7 +327,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  
  	if (mutex_lock_interruptible(&instance->vchiq_mutex))
  		return -EINTR;
-@@ -1749,6 +1884,13 @@ int vchiq_mmal_component_finalise(struct
+@@ -1750,6 +1885,13 @@ int vchiq_mmal_component_finalise(struct
  
  	component->in_use = 0;
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch b/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
index 02b8ed9411..8625928562 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
@@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1899,6 +1899,8 @@ int vchiq_mmal_component_finalise(struct
+@@ -1900,6 +1900,8 @@ int vchiq_mmal_component_finalise(struct
  	for (idx = 0; idx < component->clocks; idx++)
  		free_event_context(&component->clock[idx]);
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch b/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
index 6582bcceba..c14f6c0801 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
@@ -14,7 +14,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1765,9 +1765,26 @@ static void free_event_context(struct vc
+@@ -1766,9 +1766,26 @@ static void free_event_context(struct vc
  {
  	struct mmal_msg_context *ctx = port->event_context;
  
@@ -41,7 +41,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  }
  
  /* Initialise a mmal component and its ports
-@@ -1865,6 +1882,7 @@ int vchiq_mmal_component_init(struct vch
+@@ -1866,6 +1883,7 @@ int vchiq_mmal_component_init(struct vch
  
  release_component:
  	destroy_component(instance, component);
@@ -49,7 +49,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  unlock:
  	if (component)
  		component->in_use = 0;
-@@ -1880,7 +1898,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
+@@ -1881,7 +1899,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
  int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
  				  struct vchiq_mmal_component *component)
  {
@@ -58,7 +58,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  
  	if (mutex_lock_interruptible(&instance->vchiq_mutex))
  		return -EINTR;
-@@ -1892,14 +1910,7 @@ int vchiq_mmal_component_finalise(struct
+@@ -1893,14 +1911,7 @@ int vchiq_mmal_component_finalise(struct
  
  	component->in_use = 0;
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
index 4809951129..3c1e41ba0a 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1641,6 +1641,109 @@ command_cleanup:
+@@ -1643,6 +1643,109 @@ command_cleanup:
  }
  
  /*
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
   * non-error returns are a promise to giveback() the urb later
   * we drop ownership so next owner (or urb unlink) can get it
   */
-@@ -5469,6 +5572,7 @@ static const struct hc_driver xhci_hc_dr
+@@ -5471,6 +5574,7 @@ static const struct hc_driver xhci_hc_dr
  	.endpoint_reset =	xhci_endpoint_reset,
  	.check_bandwidth =	xhci_check_bandwidth,
  	.reset_bandwidth =	xhci_reset_bandwidth,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch b/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
index bcb322d55a..59ce232639 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
@@ -91,7 +91,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  	} else if (msg->u.buffer_from_host.buffer_header.length == 0) {
  		/* empty buffer */
  		if (msg->u.buffer_from_host.buffer_header.flags &
-@@ -1528,6 +1551,9 @@ int vchiq_mmal_port_parameter_set(struct
+@@ -1529,6 +1552,9 @@ int vchiq_mmal_port_parameter_set(struct
  
  	mutex_unlock(&instance->vchiq_mutex);
  
@@ -101,7 +101,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  	return ret;
  }
  EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set);
-@@ -1696,6 +1722,31 @@ int vchiq_mmal_submit_buffer(struct vchi
+@@ -1697,6 +1723,31 @@ int vchiq_mmal_submit_buffer(struct vchi
  	unsigned long flags = 0;
  	int ret;
  
@@ -133,7 +133,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  	ret = buffer_from_host(instance, port, buffer);
  	if (ret == -EINVAL) {
  		/* Port is disabled. Queue for when it is enabled. */
-@@ -1729,6 +1780,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
+@@ -1730,6 +1781,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
  		release_msg_context(msg_context);
  	buf->msg_context = NULL;
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch b/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
index 31162b3ce4..9fef146bfb 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
@@ -172,7 +172,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
  
-@@ -1086,9 +1101,9 @@ static int create_component(struct vchiq
+@@ -1087,9 +1102,9 @@ static int create_component(struct vchiq
  	component->outputs = rmsg->u.component_create_reply.output_num;
  	component->clocks = rmsg->u.component_create_reply.clock_num;
  
@@ -185,7 +185,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  release_msg:
  	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1257,10 +1272,9 @@ static int port_action_port(struct vchiq
+@@ -1258,10 +1273,9 @@ static int port_action_port(struct vchiq
  
  	ret = -rmsg->u.port_action_reply.status;
  
@@ -199,7 +199,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  release_msg:
  	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1304,11 +1318,11 @@ static int port_action_handle(struct vch
+@@ -1305,11 +1319,11 @@ static int port_action_handle(struct vch
  
  	ret = -rmsg->u.port_action_reply.status;
  
@@ -216,7 +216,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  release_msg:
  	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1347,9 +1361,9 @@ static int port_parameter_set(struct vch
+@@ -1348,9 +1362,9 @@ static int port_parameter_set(struct vch
  
  	ret = -rmsg->u.port_parameter_set_reply.status;
  
@@ -229,7 +229,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  release_msg:
  	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1407,8 +1421,9 @@ static int port_parameter_get(struct vch
+@@ -1408,8 +1422,9 @@ static int port_parameter_get(struct vch
  	/* Always report the size of the returned parameter to the caller */
  	*value_size = rmsg->u.port_parameter_get_reply.size;
  
@@ -241,7 +241,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  release_msg:
  	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1665,7 +1680,7 @@ int vchiq_mmal_port_connect_tunnel(struc
+@@ -1666,7 +1681,7 @@ int vchiq_mmal_port_connect_tunnel(struc
  	if (!dst) {
  		/* do not make new connection */
  		ret = 0;
@@ -250,7 +250,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  		goto release_unlock;
  	}
  
-@@ -1683,14 +1698,14 @@ int vchiq_mmal_port_connect_tunnel(struc
+@@ -1684,14 +1699,14 @@ int vchiq_mmal_port_connect_tunnel(struc
  	/* set new format */
  	ret = port_info_set(instance, dst);
  	if (ret) {
@@ -267,7 +267,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  		goto release_unlock;
  	}
  
-@@ -1699,9 +1714,9 @@ int vchiq_mmal_port_connect_tunnel(struc
+@@ -1700,9 +1715,9 @@ int vchiq_mmal_port_connect_tunnel(struc
  				 MMAL_MSG_PORT_ACTION_TYPE_CONNECT,
  				 dst->component->handle, dst->handle);
  	if (ret < 0) {
@@ -280,7 +280,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  		goto release_unlock;
  	}
  	src->connected = dst;
-@@ -1726,7 +1741,8 @@ int vchiq_mmal_submit_buffer(struct vchi
+@@ -1727,7 +1742,8 @@ int vchiq_mmal_submit_buffer(struct vchi
  	 * videobuf2 won't let us have the dmabuf there.
  	 */
  	if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) {
@@ -290,7 +290,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  		ret = vc_sm_cma_import_dmabuf(buffer->dma_buf,
  					      &buffer->vcsm_handle);
  		if (ret) {
-@@ -1742,8 +1758,8 @@ int vchiq_mmal_submit_buffer(struct vchi
+@@ -1743,8 +1759,8 @@ int vchiq_mmal_submit_buffer(struct vchi
  			vc_sm_cma_free(buffer->vcsm_handle);
  			return ret;
  		}
@@ -301,7 +301,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  	}
  
  	ret = buffer_from_host(instance, port, buffer);
-@@ -1782,8 +1798,8 @@ int mmal_vchi_buffer_cleanup(struct mmal
+@@ -1783,8 +1799,8 @@ int mmal_vchi_buffer_cleanup(struct mmal
  	if (buf->vcsm_handle) {
  		int ret;
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch b/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
index 46414dc749..8b7eb58b73 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
@@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1500,6 +1500,8 @@ static int port_enable(struct vchiq_mmal
+@@ -1501,6 +1501,8 @@ static int port_enable(struct vchiq_mmal
  
  	port->enabled = 1;
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
index 8fa58f8327..44dfc2ba56 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -1970,7 +1970,7 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1972,7 +1972,7 @@ static void mmc_blk_mq_rw_recovery(struc
  		return;
  	}
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch b/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
index 0146bbd616..b852bad904 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
@@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1730,7 +1730,7 @@ static void xhci_fixup_endpoint(struct u
+@@ -1732,7 +1732,7 @@ static void xhci_fixup_endpoint(struct u
  		return;
  	}
  	ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch b/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch
index 6f62736b08..728e433fb8 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch
@@ -71,7 +71,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  	 * hardware interrupt, we use a timer-based system.  The original
 --- a/drivers/tty/serial/8250/8250_port.c
 +++ b/drivers/tty/serial/8250/8250_port.c
-@@ -1559,6 +1559,9 @@ static void serial8250_stop_tx(struct ua
+@@ -1553,6 +1553,9 @@ static void serial8250_stop_tx(struct ua
  		serial_icr_write(up, UART_ACR, up->acr);
  	}
  	serial8250_rpm_put(up);
@@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  }
  
  static inline void __start_tx(struct uart_port *port)
-@@ -1669,6 +1672,9 @@ static void serial8250_start_tx(struct u
+@@ -1663,6 +1666,9 @@ static void serial8250_start_tx(struct u
  	struct uart_8250_port *up = up_to_u8250p(port);
  	struct uart_8250_em485 *em485 = up->em485;
  
@@ -91,7 +91,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  	if (!port->x_char && uart_circ_empty(&port->state->xmit))
  		return;
  
-@@ -1889,6 +1895,9 @@ unsigned int serial8250_modem_status(str
+@@ -1883,6 +1889,9 @@ unsigned int serial8250_modem_status(str
  			uart_handle_cts_change(port, status & UART_MSR_CTS);
  
  		wake_up_interruptible(&port->state->port.delta_msr_wait);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch b/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch
index 33150551b3..1e2119c88c 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch
@@ -35,7 +35,7 @@ Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
 
 --- a/fs/f2fs/segment.c
 +++ b/fs/f2fs/segment.c
-@@ -663,9 +663,7 @@ init_thread:
+@@ -665,9 +665,7 @@ init_thread:
  				"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
  	if (IS_ERR(fcc->f2fs_issue_flush)) {
  		err = PTR_ERR(fcc->f2fs_issue_flush);
@@ -46,7 +46,7 @@ Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  	}
  
  	return err;
-@@ -5062,11 +5060,9 @@ int f2fs_build_segment_manager(struct f2
+@@ -5064,11 +5062,9 @@ int f2fs_build_segment_manager(struct f2
  
  	init_f2fs_rwsem(&sm_info->curseg_lock);
  
diff --git a/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch b/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch
index 5d271fe4da..aaf49e6a7c 100644
--- a/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch
@@ -10,9 +10,9 @@ This reverts commit c0ea202fbc855d60bc4a0603ca52a9e80654b327.
 
 --- a/drivers/usb/phy/phy-generic.c
 +++ b/drivers/usb/phy/phy-generic.c
-@@ -272,13 +272,6 @@ int usb_phy_gen_create_phy(struct device
- 		return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
- 				     "could not get vbus regulator\n");
+@@ -265,13 +265,6 @@ int usb_phy_gen_create_phy(struct device
+ 			return -EPROBE_DEFER;
+ 	}
  
 -	nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
 -	if (PTR_ERR(nop->vbus_draw) == -ENODEV)
diff --git a/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch b/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch
index 99ec42fe48..69f52fa403 100644
--- a/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch
+++ b/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch
@@ -361,7 +361,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
  static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7943,6 +7943,7 @@ static void __init free_area_init_node(i
+@@ -7945,6 +7945,7 @@ static void __init free_area_init_node(i
  	pgdat_set_deferred_range(pgdat);
  
  	free_area_init_core(pgdat);
diff --git a/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch b/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch
index 60a90136c9..5c4206da14 100644
--- a/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch
+++ b/target/linux/generic/backport-6.1/810-v6.3-i915-Move-list_count-to-list.h-as-list_count_nodes-f.patch
@@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
 +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
-@@ -4154,17 +4154,6 @@ void intel_execlists_show_requests(struc
+@@ -4157,17 +4157,6 @@ void intel_execlists_show_requests(struc
  	spin_unlock_irqrestore(&sched_engine->lock, flags);
  }
  
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  void intel_execlists_dump_active_requests(struct intel_engine_cs *engine,
  					  struct i915_request *hung_rq,
  					  struct drm_printer *m)
-@@ -4175,8 +4164,8 @@ void intel_execlists_dump_active_request
+@@ -4178,8 +4167,8 @@ void intel_execlists_dump_active_request
  
  	intel_engine_dump_active_requests(&engine->sched_engine->requests, hung_rq, m);
  
diff --git a/target/linux/generic/backport-6.1/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch b/target/linux/generic/backport-6.1/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
index 35b15776fb..be293e6f2a 100644
--- a/target/linux/generic/backport-6.1/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
+++ b/target/linux/generic/backport-6.1/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
@@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	imx_ocotp_nvmem_config.priv = priv;
 --- a/drivers/nvmem/meson-efuse.c
 +++ b/drivers/nvmem/meson-efuse.c
-@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat
+@@ -74,6 +74,7 @@ static int meson_efuse_probe(struct plat
  
  	econfig->dev = dev;
  	econfig->name = dev_name(dev);
diff --git a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
index 51f939356f..dfbe88e8e6 100644
--- a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
@@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1147,6 +1152,11 @@ static const struct usb_device_id option
+@@ -1152,6 +1157,11 @@ static const struct usb_device_id option
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
  	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
@@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  	/* Quectel products using Qualcomm vendor ID */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
-@@ -1188,6 +1198,11 @@ static const struct usb_device_id option
+@@ -1193,6 +1203,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },
diff --git a/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
index 4bf473f9a7..a3d66c54b3 100644
--- a/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ b/target/linux/generic/pending-6.1/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
-@@ -7897,7 +7897,7 @@ static void __init alloc_node_mem_map(st
+@@ -7899,7 +7899,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)
diff --git a/target/linux/generic/pending-6.1/450-14-mmc-block-set-fwnode-of-disk-devices.patch b/target/linux/generic/pending-6.1/450-14-mmc-block-set-fwnode-of-disk-devices.patch
index a9e53f1155..386282459b 100644
--- a/target/linux/generic/pending-6.1/450-14-mmc-block-set-fwnode-of-disk-devices.patch
+++ b/target/linux/generic/pending-6.1/450-14-mmc-block-set-fwnode-of-disk-devices.patch
@@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -2484,6 +2484,8 @@ static struct mmc_blk_data *mmc_blk_allo
+@@ -2486,6 +2486,8 @@ static struct mmc_blk_data *mmc_blk_allo
  					      int area_type,
  					      unsigned int part_type)
  {
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  	struct mmc_blk_data *md;
  	int devidx, ret;
  	char cap_str[10];
-@@ -2580,6 +2582,13 @@ static struct mmc_blk_data *mmc_blk_allo
+@@ -2582,6 +2584,13 @@ static struct mmc_blk_data *mmc_blk_allo
  
  	blk_queue_write_cache(md->queue.queue, cache_enabled, fua_enabled);
  
diff --git a/target/linux/generic/pending-6.1/450-15-mmc-block-set-GENHD_FL_NVMEM.patch b/target/linux/generic/pending-6.1/450-15-mmc-block-set-GENHD_FL_NVMEM.patch
index d76e7b2fe5..41c257cdeb 100644
--- a/target/linux/generic/pending-6.1/450-15-mmc-block-set-GENHD_FL_NVMEM.patch
+++ b/target/linux/generic/pending-6.1/450-15-mmc-block-set-GENHD_FL_NVMEM.patch
@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -2538,6 +2538,7 @@ static struct mmc_blk_data *mmc_blk_allo
+@@ -2540,6 +2540,7 @@ static struct mmc_blk_data *mmc_blk_allo
  	md->disk->major	= MMC_BLOCK_MAJOR;
  	md->disk->minors = perdev_minors;
  	md->disk->first_minor = devidx * perdev_minors;
diff --git a/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
index 4c3ac8ee07..3133e4e5da 100644
--- a/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
+++ b/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -7918,7 +7918,7 @@ static int nft_register_flowtable_net_ho
+@@ -7925,7 +7925,7 @@ static int nft_register_flowtable_net_ho
  		err = flowtable->data.type->setup(&flowtable->data,
  						  hook->ops.dev,
  						  FLOW_BLOCK_BIND);
diff --git a/target/linux/generic/pending-6.1/834-ledtrig-libata.patch b/target/linux/generic/pending-6.1/834-ledtrig-libata.patch
index 050c3515f6..39960bc090 100644
--- a/target/linux/generic/pending-6.1/834-ledtrig-libata.patch
+++ b/target/linux/generic/pending-6.1/834-ledtrig-libata.patch
@@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  /*
   * Define if arch has non-standard setup.  This is a _PCI_ standard
-@@ -864,6 +867,12 @@ struct ata_port {
+@@ -865,6 +868,12 @@ struct ata_port {
  #ifdef CONFIG_ATA_ACPI
  	struct ata_acpi_gtm	__acpi_init_gtm; /* use ata_acpi_init_gtm() */
  #endif
diff --git a/target/linux/mediatek/patches-6.1/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-6.1/410-bt-mtk-serial-fix.patch
index 5b94c9216d..fa232b5d4e 100644
--- a/target/linux/mediatek/patches-6.1/410-bt-mtk-serial-fix.patch
+++ b/target/linux/mediatek/patches-6.1/410-bt-mtk-serial-fix.patch
@@ -19,7 +19,7 @@
  	},
  	[PORT_NPCM] = {
  		.name		= "Nuvoton 16550",
-@@ -2773,6 +2773,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2767,6 +2767,11 @@ serial8250_do_set_termios(struct uart_po
  	unsigned long flags;
  	unsigned int baud, quot, frac = 0;
  
diff --git a/target/linux/pistachio/patches-6.1/110-pwm-img-fix-clock-lookup.patch b/target/linux/pistachio/patches-6.1/110-pwm-img-fix-clock-lookup.patch
deleted file mode 100644
index d77a2f4259..0000000000
--- a/target/linux/pistachio/patches-6.1/110-pwm-img-fix-clock-lookup.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 58d03770ac5f78ff2d819caabea9371a041bf7be Mon Sep 17 00:00:00 2001
-From: Zoltan HERPAI <wigyori@uid0.hu>
-Date: Wed, 20 Mar 2024 09:36:02 +0100
-Subject: pwm: img: fix pwm clock lookup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-22e8e19 has introduced a regression in the imgchip->pwm_clk lookup, whereas
-the clock name has also been renamed to "imgchip". This causes the driver
-failing to load:
-
-[    0.546905] img-pwm 18101300.pwm: failed to get imgchip clock
-[    0.553418] img-pwm: probe of 18101300.pwm failed with error -2
-
-Fix this lookup by reverting the clock name back to "pwm".
-
-Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
-Link: https://lore.kernel.org/r/20240320083602.81592-1-wigyori@uid0.hu
-Fixes: 22e8e19a46f7 ("pwm: img: Rename variable pointing to driver private data")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
----
- drivers/pwm/pwm-img.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/pwm/pwm-img.c
-+++ b/drivers/pwm/pwm-img.c
-@@ -289,9 +289,9 @@ static int img_pwm_probe(struct platform
- 		return PTR_ERR(imgchip->sys_clk);
- 	}
- 
--	imgchip->pwm_clk = devm_clk_get(&pdev->dev, "imgchip");
-+	imgchip->pwm_clk = devm_clk_get(&pdev->dev, "pwm");
- 	if (IS_ERR(imgchip->pwm_clk)) {
--		dev_err(&pdev->dev, "failed to get imgchip clock\n");
-+		dev_err(&pdev->dev, "failed to get pwm clock\n");
- 		return PTR_ERR(imgchip->pwm_clk);
- 	}
-