drop drm-nouveau-check-ioctl-command-codes-better.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index 090606cb25640ad5089ce6e11d3ef651b25b0056..8c9be73a315224150a204b166ace7c6f63877b2e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -56,3 +56,4 @@ bluetooth-l2cap-fix-attempting-to-adjust-outgoing-mt.patch
 net-vlan-fix-vlan-0-refcount-imbalance-of-toggling-f.patch
 net-bridge-do-not-offload-igmp-mld-messages.patch
 net-sched-return-null-when-htb_lookup_leaf-encounter.patch
+sched-change-nr_uninterruptible-type-to-unsigned-long.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index b6acf1ce3ee05f8f77743b7d808f1d4968e826e3..a36e3fabcaa1b418aacecc2cecb250ef3490c8f3 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -63,3 +63,4 @@ net-vlan-fix-vlan-0-refcount-imbalance-of-toggling-f.patch
 net-bridge-do-not-offload-igmp-mld-messages.patch
 net-sched-return-null-when-htb_lookup_leaf-encounter.patch
 revert-cgroup_freezer-cgroup_freezing-check-if-not-f.patch
+sched-change-nr_uninterruptible-type-to-unsigned-long.patch

diff --git a/queue-6.12/drm-nouveau-check-ioctl-command-codes-better.patch b/queue-6.12/drm-nouveau-check-ioctl-command-codes-better.patch
deleted file mode 100644 (file)
index d78377f..0000000
--- a/queue-6.12/drm-nouveau-check-ioctl-command-codes-better.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 8da013f954c13c148ee0c0af5a24012cda05b4da Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Jul 2025 09:24:53 +0200
-Subject: drm/nouveau: check ioctl command codes better
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit e5478166dffb51fa64e76cdbb5c24421f22f2d43 ]
-
-nouveau_drm_ioctl() only checks the _IOC_NR() bits in the
-DRM_NOUVEAU_NVIF command, but ignores the type and direction bits, so any
-command with '7' in the low eight bits gets passed into
-nouveau_abi16_ioctl() instead of drm_ioctl().
-
-Check for all the bits except the size that is handled inside of the
-handler.
-
-Fixes: 27111a23d01c ("drm/nouveau: expose the full object/event interfaces to userspace")
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-[ Fix up two checkpatch warnings and a typo. - Danilo ]
-Signed-off-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20250711072458.2665325-1-arnd@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
-index 6e5adab034713..7b7c942779390 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drm.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -1256,6 +1256,9 @@ nouveau_ioctls[] = {
-       DRM_IOCTL_DEF_DRV(NOUVEAU_EXEC, nouveau_exec_ioctl_exec, DRM_RENDER_ALLOW),
- };
- 
-+#define DRM_IOCTL_NOUVEAU_NVIF _IOC(_IOC_READ | _IOC_WRITE, DRM_IOCTL_BASE, \
-+                                  DRM_COMMAND_BASE + DRM_NOUVEAU_NVIF, 0)
-+
- long
- nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- {
-@@ -1269,14 +1272,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-               return ret;
-       }
- 
--      switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) {
--      case DRM_NOUVEAU_NVIF:
-+      if ((cmd & ~IOCSIZE_MASK) == DRM_IOCTL_NOUVEAU_NVIF)
-               ret = nouveau_abi16_ioctl(filp, (void __user *)arg, _IOC_SIZE(cmd));
--              break;
--      default:
-+      else
-               ret = drm_ioctl(file, cmd, arg);
--              break;
--      }
- 
-       pm_runtime_mark_last_busy(dev->dev);
-       pm_runtime_put_autosuspend(dev->dev);
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 19db3a8d49d1cd2eeb205a5519f4dc6d3f29f25f..a501eff19422c2224d1e8160c92290772aed0653 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -87,7 +87,6 @@ arm64-dts-imx95-correct-the-dma-interrupter-number-o.patch
 bpf-reject-p-format-string-in-bprintf-like-helpers.patch
 selftests-sched_ext-fix-exit-selftest-hang-on-up.patch
 cachefiles-fix-the-incorrect-return-value-in-__cache.patch
-drm-nouveau-check-ioctl-command-codes-better.patch
 net-emaclite-fix-missing-pointer-increment-in-aligne.patch
 block-fix-kobject-leak-in-blk_unregister_queue.patch
 net-sched-sch_qfq-fix-race-condition-on-qfq_aggregat.patch
@@ -138,3 +137,4 @@ drm-mediatek-add-wait_event_timeout-when-disabling-p.patch
 drm-mediatek-only-announce-afbc-if-really-supported.patch
 libbpf-fix-handling-of-bpf-arena-relocations.patch
 efivarfs-fix-memory-leak-of-efivarfs_fs_info-in-fs_c.patch
+sched-change-nr_uninterruptible-type-to-unsigned-long.patch

diff --git a/queue-6.15/drm-nouveau-check-ioctl-command-codes-better.patch b/queue-6.15/drm-nouveau-check-ioctl-command-codes-better.patch
deleted file mode 100644 (file)
index abfbb68..0000000
--- a/queue-6.15/drm-nouveau-check-ioctl-command-codes-better.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 30cd8dd6867dba92feb92131114cbb2230b083e6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Jul 2025 09:24:53 +0200
-Subject: drm/nouveau: check ioctl command codes better
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-[ Upstream commit e5478166dffb51fa64e76cdbb5c24421f22f2d43 ]
-
-nouveau_drm_ioctl() only checks the _IOC_NR() bits in the
-DRM_NOUVEAU_NVIF command, but ignores the type and direction bits, so any
-command with '7' in the low eight bits gets passed into
-nouveau_abi16_ioctl() instead of drm_ioctl().
-
-Check for all the bits except the size that is handled inside of the
-handler.
-
-Fixes: 27111a23d01c ("drm/nouveau: expose the full object/event interfaces to userspace")
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-[ Fix up two checkpatch warnings and a typo. - Danilo ]
-Signed-off-by: Danilo Krummrich <dakr@kernel.org>
-Link: https://lore.kernel.org/r/20250711072458.2665325-1-arnd@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
-index ba18abd9643e0..6bce4c4786e9f 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drm.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -1279,6 +1279,9 @@ nouveau_ioctls[] = {
-       DRM_IOCTL_DEF_DRV(NOUVEAU_EXEC, nouveau_exec_ioctl_exec, DRM_RENDER_ALLOW),
- };
- 
-+#define DRM_IOCTL_NOUVEAU_NVIF _IOC(_IOC_READ | _IOC_WRITE, DRM_IOCTL_BASE, \
-+                                  DRM_COMMAND_BASE + DRM_NOUVEAU_NVIF, 0)
-+
- long
- nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- {
-@@ -1292,14 +1295,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-               return ret;
-       }
- 
--      switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) {
--      case DRM_NOUVEAU_NVIF:
-+      if ((cmd & ~IOCSIZE_MASK) == DRM_IOCTL_NOUVEAU_NVIF)
-               ret = nouveau_abi16_ioctl(filp, (void __user *)arg, _IOC_SIZE(cmd));
--              break;
--      default:
-+      else
-               ret = drm_ioctl(file, cmd, arg);
--              break;
--      }
- 
-       pm_runtime_mark_last_busy(dev->dev);
-       pm_runtime_put_autosuspend(dev->dev);
--- 
-2.39.5
-

diff --git a/queue-6.15/series b/queue-6.15/series
index 5c4335f69807a1fbf9de894d1c69c9a2e1740f18..7182f99e906635e2530b1433a1c2bc01c146603d 100644 (file)
--- a/queue-6.15/series
+++ b/queue-6.15/series
@@ -107,7 +107,6 @@ selftests-sched_ext-fix-exit-selftest-hang-on-up.patch
 wifi-iwlwifi-mask-reserved-bits-in-chan_state_active.patch
 cachefiles-fix-the-incorrect-return-value-in-__cache.patch
 alsa-compress_offload-tighten-ioctl-command-number-c.patch
-drm-nouveau-check-ioctl-command-codes-better.patch
 net-emaclite-fix-missing-pointer-increment-in-aligne.patch
 block-fix-kobject-leak-in-blk_unregister_queue.patch
 net-sched-sch_qfq-fix-race-condition-on-qfq_aggregat.patch
@@ -164,3 +163,4 @@ drm-mediatek-add-wait_event_timeout-when-disabling-p.patch
 drm-mediatek-only-announce-afbc-if-really-supported.patch
 libbpf-fix-handling-of-bpf-arena-relocations.patch
 efivarfs-fix-memory-leak-of-efivarfs_fs_info-in-fs_c.patch
+sched-change-nr_uninterruptible-type-to-unsigned-long.patch

diff --git a/queue-6.6/series b/queue-6.6/series
index 6c6a22922873ff4f384270d38329cb984bbbc3c7..a02cc796e2079aae11dcde680c2796a6724dc4ba 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -90,3 +90,4 @@ net-sched-return-null-when-htb_lookup_leaf-encounter.patch
 rxrpc-fix-recv-recv-race-of-completed-call.patch
 rxrpc-fix-transmission-of-an-abort-in-response-to-an.patch
 revert-cgroup_freezer-cgroup_freezing-check-if-not-f.patch
+sched-change-nr_uninterruptible-type-to-unsigned-long.patch