kernel: bump 6.12 to 6.12.80

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.80

Manually rebased:
  generic-hack/902-debloat_proc.patch

All other patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22742
(cherry picked from commit 2fab6c937a363adc5ca88ce562aff0cbe2a98133)
Link: https://github.com/openwrt/openwrt/pull/23162
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

14 files changed, 33 insertions, 33 deletions

diff --git a/target/linux/bcm27xx/patches-6.12/950-0016-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch b/target/linux/bcm27xx/patches-6.12/950-0016-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
index fb66aaceba..6ce3398652 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0016-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0016-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
@@ -88,7 +88,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  			commit->event = kzalloc(sizeof(*commit->event),
 --- a/drivers/gpu/drm/i915/display/intel_display.c
 +++ b/drivers/gpu/drm/i915/display/intel_display.c
-@@ -7645,6 +7645,19 @@ int intel_atomic_commit(struct drm_devic
+@@ -7651,6 +7651,19 @@ int intel_atomic_commit(struct drm_devic
  				state->base.legacy_cursor_update = false;
  	}
  
diff --git a/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
index c38edf1184..36c7ab69f5 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -254,6 +254,9 @@
+@@ -255,6 +255,9 @@
  #define USB_VENDOR_ID_BAANTO		0x2453
  #define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
  
@@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
  
-@@ -1480,6 +1483,9 @@
+@@ -1481,6 +1484,9 @@
  #define USB_VENDOR_ID_XIAOMI		0x2717
  #define USB_DEVICE_ID_MI_SILENT_MOUSE	0x5014
  
diff --git a/target/linux/bcm27xx/patches-6.12/950-0172-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-6.12/950-0172-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
index 4d5aae743a..0f7420cb55 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0172-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0172-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
@@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3906,6 +3906,7 @@ static int spi_set_cs_timing(struct spi_
+@@ -3901,6 +3901,7 @@ static int spi_set_cs_timing(struct spi_
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  	unsigned	bad_bits, ugly_bits;
  	int		status;
  
-@@ -3932,6 +3933,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3927,6 +3928,14 @@ int spi_setup(struct spi_device *spi)
  			"setup: MOSI configured to idle low and high at the same time.\n");
  		return -EINVAL;
  	}
diff --git a/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch
index dcac114e9f..92f7bf7771 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch
@@ -409,7 +409,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  static int __maybe_unused macb_suspend(struct device *dev)
  {
  	struct net_device *netdev = dev_get_drvdata(dev);
-@@ -5607,6 +5754,7 @@ static const struct dev_pm_ops macb_pm_o
+@@ -5616,6 +5763,7 @@ static const struct dev_pm_ops macb_pm_o
  static struct platform_driver macb_driver = {
  	.probe		= macb_probe,
  	.remove_new	= macb_remove,
diff --git a/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch b/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
index 9e5476c9fd..4e15efbde6 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0685-nvme-pci-Disable-Host-Memory-Buffer-usage.patch
@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
-@@ -2111,6 +2111,7 @@ static void nvme_free_host_mem(struct nv
+@@ -2112,6 +2112,7 @@ static void nvme_free_host_mem(struct nv
  	dev->nr_host_mem_descs = 0;
  }
  
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
  		u32 chunk_size)
  {
-@@ -2179,9 +2180,11 @@ out:
+@@ -2180,9 +2181,11 @@ out:
  	dev->host_mem_descs = NULL;
  	return -ENOMEM;
  }
@@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  	u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
  	u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
  	u64 chunk_size;
-@@ -2194,6 +2197,7 @@ static int nvme_alloc_host_mem(struct nv
+@@ -2195,6 +2198,7 @@ static int nvme_alloc_host_mem(struct nv
  			nvme_free_host_mem(dev);
  		}
  	}
diff --git a/target/linux/bcm27xx/patches-6.12/950-0828-media-mc-add-manual-request-completion.patch b/target/linux/bcm27xx/patches-6.12/950-0828-media-mc-add-manual-request-completion.patch
index 2045c6af97..66c81ab0c6 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0828-media-mc-add-manual-request-completion.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0828-media-mc-add-manual-request-completion.patch
@@ -30,7 +30,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  	wake_up_interruptible_all(&req->poll_wait);
  }
  
-@@ -319,6 +320,7 @@ int media_request_alloc(struct media_dev
+@@ -324,6 +325,7 @@ int media_request_alloc(struct media_dev
  	req->mdev = mdev;
  	req->state = MEDIA_REQUEST_STATE_IDLE;
  	req->num_incomplete_objects = 0;
@@ -38,7 +38,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  	kref_init(&req->kref);
  	INIT_LIST_HEAD(&req->objects);
  	spin_lock_init(&req->lock);
-@@ -465,7 +467,7 @@ void media_request_object_unbind(struct
+@@ -470,7 +472,7 @@ void media_request_object_unbind(struct
  
  	req->num_incomplete_objects--;
  	if (req->state == MEDIA_REQUEST_STATE_QUEUED &&
@@ -47,7 +47,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  		req->state = MEDIA_REQUEST_STATE_COMPLETE;
  		completed = true;
  		wake_up_interruptible_all(&req->poll_wait);
-@@ -494,7 +496,7 @@ void media_request_object_complete(struc
+@@ -499,7 +501,7 @@ void media_request_object_complete(struc
  	    WARN_ON(req->state != MEDIA_REQUEST_STATE_QUEUED))
  		goto unlock;
  
@@ -56,7 +56,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  		req->state = MEDIA_REQUEST_STATE_COMPLETE;
  		wake_up_interruptible_all(&req->poll_wait);
  		completed = true;
-@@ -505,3 +507,35 @@ unlock:
+@@ -510,3 +512,35 @@ unlock:
  		media_request_put(req);
  }
  EXPORT_SYMBOL_GPL(media_request_object_complete);
diff --git a/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch b/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
index 7ad80a032c..03871aa480 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0830-media-mc-add-debugfs-node-to-keep-track-of-requests.patch
@@ -114,7 +114,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  }
  
  void media_request_put(struct media_request *req)
-@@ -332,6 +333,7 @@ int media_request_alloc(struct media_dev
+@@ -337,6 +338,7 @@ int media_request_alloc(struct media_dev
  
  	snprintf(req->debug_str, sizeof(req->debug_str), "%u:%d",
  		 atomic_inc_return(&mdev->request_id), fd);
@@ -122,7 +122,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  	dev_dbg(mdev->dev, "request: allocated %s\n", req->debug_str);
  
  	fd_install(fd, filp);
-@@ -355,10 +357,12 @@ static void media_request_object_release
+@@ -360,10 +362,12 @@ static void media_request_object_release
  	struct media_request_object *obj =
  		container_of(kref, struct media_request_object, kref);
  	struct media_request *req = obj->req;
@@ -135,7 +135,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  }
  
  struct media_request_object *
-@@ -423,6 +427,7 @@ int media_request_object_bind(struct med
+@@ -428,6 +432,7 @@ int media_request_object_bind(struct med
  	obj->req = req;
  	obj->ops = ops;
  	obj->priv = priv;
@@ -143,7 +143,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  
  	if (is_buffer)
  		list_add_tail(&obj->list, &req->objects);
-@@ -430,6 +435,7 @@ int media_request_object_bind(struct med
+@@ -435,6 +440,7 @@ int media_request_object_bind(struct med
  		list_add(&obj->list, &req->objects);
  	req->num_incomplete_objects++;
  	ret = 0;
diff --git a/target/linux/generic/hack-6.12/204-module_strip.patch b/target/linux/generic/hack-6.12/204-module_strip.patch
index 6f6f6a70d9..22da0d3cfa 100644
--- a/target/linux/generic/hack-6.12/204-module_strip.patch
+++ b/target/linux/generic/hack-6.12/204-module_strip.patch
@@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  /* Parse tag=value strings from .modinfo section */
  char *module_next_tag_pair(char *string, unsigned long *secsize)
-@@ -2095,9 +2097,11 @@ static void module_augment_kernel_taints
+@@ -2102,9 +2104,11 @@ static void module_augment_kernel_taints
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -131,7 +131,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (flags & MODULE_INIT_IGNORE_VERMAGIC)
  		modmagic = NULL;
  
-@@ -2111,6 +2115,7 @@ static int check_modinfo(struct module *
+@@ -2118,6 +2122,7 @@ static int check_modinfo(struct module *
  		       info->name, modmagic, vermagic);
  		return -ENOEXEC;
  	}
diff --git a/target/linux/generic/hack-6.12/259-regmap_dynamic.patch b/target/linux/generic/hack-6.12/259-regmap_dynamic.patch
index 4f48fc0690..72b282005e 100644
--- a/target/linux/generic/hack-6.12/259-regmap_dynamic.patch
+++ b/target/linux/generic/hack-6.12/259-regmap_dynamic.patch
@@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/property.h>
-@@ -3523,3 +3524,5 @@ static int __init regmap_initcall(void)
+@@ -3545,3 +3546,5 @@ static int __init regmap_initcall(void)
  	return 0;
  }
  postcore_initcall(regmap_initcall);
diff --git a/target/linux/generic/hack-6.12/902-debloat_proc.patch b/target/linux/generic/hack-6.12/902-debloat_proc.patch
index e3e2defa96..fe45d47ec5 100644
--- a/target/linux/generic/hack-6.12/902-debloat_proc.patch
+++ b/target/linux/generic/hack-6.12/902-debloat_proc.patch
@@ -287,7 +287,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		goto err;
 --- a/net/core/net-procfs.c
 +++ b/net/core/net-procfs.c
-@@ -295,10 +295,12 @@ static int __net_init dev_proc_net_init(
+@@ -312,10 +312,12 @@ static int __net_init dev_proc_net_init(
  	if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops,
  			sizeof(struct seq_net_private)))
  		goto out;
@@ -299,10 +299,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -	if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
 +	if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
 +			!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
- 			sizeof(struct seq_net_private)))
+ 			sizeof(struct ptype_iter_state)))
  		goto out_softnet;
  
-@@ -308,9 +310,11 @@ static int __net_init dev_proc_net_init(
+@@ -325,9 +327,11 @@ static int __net_init dev_proc_net_init(
  out:
  	return rc;
  out_ptype:
@@ -316,7 +316,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  out_dev:
  	remove_proc_entry("dev", net->proc_net);
  	goto out;
-@@ -320,8 +324,10 @@ static void __net_exit dev_proc_net_exit
+@@ -337,8 +341,10 @@ static void __net_exit dev_proc_net_exit
  {
  	wext_proc_exit(net);
  
diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12
index eda0774e7d..427a005af7 100644
--- a/target/linux/generic/kernel-6.12
+++ b/target/linux/generic/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .79
-LINUX_KERNEL_HASH-6.12.79 = 4bfa751f33de2a5d7ecb4ff964743a027fc726a2225a76a18f92f0582aa0790b
+LINUX_VERSION-6.12 = .80
+LINUX_KERNEL_HASH-6.12.80 = c92591d896e79ecddbc3319136f0c2f855e832b397de7593f013ad7590a43e53
diff --git a/target/linux/generic/pending-6.12/630-packet_socket_type.patch b/target/linux/generic/pending-6.12/630-packet_socket_type.patch
index 769696e404..fff421bd3c 100644
--- a/target/linux/generic/pending-6.12/630-packet_socket_type.patch
+++ b/target/linux/generic/pending-6.12/630-packet_socket_type.patch
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
  
-@@ -3429,6 +3431,7 @@ static int packet_create(struct net *net
+@@ -3430,6 +3432,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -4096,6 +4099,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -4097,6 +4100,16 @@ packet_setsockopt(struct socket *sock, i
  		packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val);
  		return 0;
  	}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -4158,6 +4171,13 @@ static int packet_getsockopt(struct sock
+@@ -4159,6 +4172,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_COPY_THRESH:
  		val = READ_ONCE(pkt_sk(sk)->copy_thresh);
  		break;
diff --git a/target/linux/generic/pending-6.12/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-6.12/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index 2f90df6013..48123c32ce 100644
--- a/target/linux/generic/pending-6.12/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-6.12/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  struct rtnl_link {
  	rtnl_doit_func		doit;
-@@ -5009,7 +5009,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -5012,7 +5012,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
  	    brport_nla_put_flag(skb, flags, mask,
  				IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
  	    brport_nla_put_flag(skb, flags, mask,
diff --git a/target/linux/mediatek/patches-6.12/432-drivers-spi-Add-support-for-dynamic-calibration.patch b/target/linux/mediatek/patches-6.12/432-drivers-spi-Add-support-for-dynamic-calibration.patch
index 9d16a43a28..4e51dc21c6 100644
--- a/target/linux/mediatek/patches-6.12/432-drivers-spi-Add-support-for-dynamic-calibration.patch
+++ b/target/linux/mediatek/patches-6.12/432-drivers-spi-Add-support-for-dynamic-calibration.patch
@@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
 
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1494,6 +1494,70 @@ static int spi_transfer_wait(struct spi_
+@@ -1489,6 +1489,70 @@ static int spi_transfer_wait(struct spi_
  	return 0;
  }
  
@@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static void _spi_transfer_delay_ns(u32 ns)
  {
  	if (!ns)
-@@ -2352,6 +2416,75 @@ void spi_flush_queue(struct spi_controll
+@@ -2347,6 +2411,75 @@ void spi_flush_queue(struct spi_controll
  /*-------------------------------------------------------------------------*/
  
  #if defined(CONFIG_OF)
@@ -158,7 +158,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static void of_spi_parse_dt_cs_delay(struct device_node *nc,
  				     struct spi_delay *delay, const char *prop)
  {
-@@ -2516,6 +2649,10 @@ of_register_spi_device(struct spi_contro
+@@ -2511,6 +2644,10 @@ of_register_spi_device(struct spi_contro
  	if (rc)
  		goto err_out;