drop 4.9 drm patch

diff --git a/queue-4.9/drm-use-kvzalloc-for-allocating-blob-property-memory.patch b/queue-4.9/drm-use-kvzalloc-for-allocating-blob-property-memory.patch
deleted file mode 100644 (file)
index 46d4be1..0000000
--- a/queue-4.9/drm-use-kvzalloc-for-allocating-blob-property-memory.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 718b5406cd76f1aa6434311241b7febf0e8571ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
-Date: Fri, 29 Jun 2018 16:27:10 +0200
-Subject: drm: Use kvzalloc for allocating blob property memory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-commit 718b5406cd76f1aa6434311241b7febf0e8571ff upstream.
-
-The property size may be controlled by userspace, can be large (I've
-seen failure with order 4, i.e. 16 pages / 64 KB) and doesn't need to be
-physically contiguous.
-
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20180629142710.2069-1-michel@daenzer.net
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/drm_property.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/drm_property.c
-+++ b/drivers/gpu/drm/drm_property.c
-@@ -530,7 +530,7 @@ static void drm_property_free_blob(struc
- 
-       drm_mode_object_unregister(blob->dev, &blob->base);
- 
--      kfree(blob);
-+      kvfree(blob);
- }
- 
- /**
-@@ -557,7 +557,7 @@ drm_property_create_blob(struct drm_devi
-       if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob))
-               return ERR_PTR(-EINVAL);
- 
--      blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
-+      blob = kvzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
-       if (!blob)
-               return ERR_PTR(-ENOMEM);
- 
-@@ -573,7 +573,7 @@ drm_property_create_blob(struct drm_devi
-       ret = drm_mode_object_get_reg(dev, &blob->base, DRM_MODE_OBJECT_BLOB,
-                                     true, drm_property_free_blob);
-       if (ret) {
--              kfree(blob);
-+              kvfree(blob);
-               return ERR_PTR(-EINVAL);
-       }
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index bedf7c2bec9ede7bc0b055877d6e2e90c57511e7..b1dd060217a45ee1baab2bc56dcce3c9d2b42064 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -22,7 +22,6 @@ scsi-sg-mitigate-read-write-abuse.patch
 s390-correct-register-corruption-in-critical-section-cleanup.patch
 drbd-fix-access-after-free.patch
 cifs-fix-infinite-loop-when-using-hard-mount-option.patch
-drm-use-kvzalloc-for-allocating-blob-property-memory.patch
 drm-udl-fix-display-corruption-of-the-last-line.patch
 jbd2-don-t-mark-block-as-modified-if-the-handle-is-out-of-credits.patch
 ext4-make-sure-bitmaps-and-the-inode-table-don-t-overlap-with-bg-descriptors.patch
@@ -34,3 +33,4 @@ ext4-clear-i_data-in-ext4_inode_info-when-removing-inline-data.patch
 ext4-add-more-inode-number-paranoia-checks.patch
 ext4-add-more-mount-time-checks-of-the-superblock.patch
 ext4-check-superblock-mapped-prior-to-committing.patch
+mlxsw-spectrum-forbid-linking-of-vlan-devices-to-devices-that-have-uppers.patch