drop drm patch from 6.1

diff --git a/queue-6.1/drm-amdgpu-fix-the-warning-about-the-expression-int-.patch b/queue-6.1/drm-amdgpu-fix-the-warning-about-the-expression-int-.patch
deleted file mode 100644 (file)
index 50d4785..0000000
--- a/queue-6.1/drm-amdgpu-fix-the-warning-about-the-expression-int-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c71e1d31c7d6735e32dcfd0043970d9fadb00b82 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 25 Apr 2024 15:16:40 +0800
-Subject: drm/amdgpu: fix the warning about the expression (int)size - len
-
-From: Jesse Zhang <jesse.zhang@amd.com>
-
-[ Upstream commit ea686fef5489ef7a2450a9fdbcc732b837fb46a8 ]
-
-Converting size from size_t to int may overflow.
-v2: keep reverse xmas tree order (Christian)
-
-Signed-off-by: Jesse Zhang <jesse.zhang@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
-index 06ab6066da61a..20045d7cd9316 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
-@@ -1886,12 +1886,13 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f,
-       struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)->i_private;
-       char reg_offset[11];
-       uint32_t *new = NULL, *tmp = NULL;
--      int ret, i = 0, len = 0;
-+      unsigned int len = 0;
-+      int ret, i = 0;
- 
-       do {
-               memset(reg_offset, 0, 11);
-               if (copy_from_user(reg_offset, buf + len,
--                                      min(10, ((int)size-len)))) {
-+                                      min(10, (size-len)))) {
-                       ret = -EFAULT;
-                       goto error_free;
-               }
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 4b45fd2eaf1f2079dcebba3c57439bf850b08c1b..3bd26c11e8dade67227393fa00430480bfc14e7a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -14,7 +14,6 @@ drm-amd-display-check-index-msg_id-before-read-or-wr.patch
 drm-amd-display-check-pipe-offset-before-setting-vbl.patch
 drm-amd-display-skip-finding-free-audio-for-unknown-.patch
 drm-amdgpu-fix-uninitialized-scalar-variable-warning.patch
-drm-amdgpu-fix-the-warning-about-the-expression-int-.patch
 media-dw2102-don-t-translate-i2c-read-into-write.patch
 sctp-prefer-struct_size-over-open-coded-arithmetic.patch
 firmware-dmi-stop-decoding-on-broken-entry.patch