drop drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two...

diff --git a/queue-3.18/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch b/queue-3.18/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
deleted file mode 100644 (file)
index fc95c3a..0000000
--- a/queue-3.18/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Mon May 28 08:52:37 CEST 2018
-From: Markus Elfring <elfring@users.sourceforge.net>
-Date: Thu, 8 Feb 2018 18:42:51 +0100
-Subject: drm/exynos: g2d: Delete an error message for a failed memory allocation in two functions
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 6f0a60298bbbea43ab5e3955913ab19c153076f3 ]
-
-Omit an extra message for a memory allocation failure in these functions.
-
-This issue was detected by using the Coccinelle software.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/exynos/exynos_drm_g2d.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-@@ -268,7 +268,6 @@ static int g2d_init_cmdlist(struct g2d_d
- 
-       node = kcalloc(G2D_CMDLIST_NUM, sizeof(*node), GFP_KERNEL);
-       if (!node) {
--              dev_err(dev, "failed to allocate memory\n");
-               ret = -ENOMEM;
-               goto err;
-       }
-@@ -1264,10 +1263,9 @@ int exynos_g2d_exec_ioctl(struct drm_dev
-               return -EFAULT;
- 
-       runqueue_node = kmem_cache_alloc(g2d->runqueue_slab, GFP_KERNEL);
--      if (!runqueue_node) {
--              dev_err(dev, "failed to allocate memory\n");
-+      if (!runqueue_node)
-               return -ENOMEM;
--      }
-+
-       run_cmdlist = &runqueue_node->run_cmdlist;
-       event_list = &runqueue_node->event_list;
-       INIT_LIST_HEAD(run_cmdlist);

diff --git a/queue-3.18/series b/queue-3.18/series
index c9ec3204e9c4098d9cf35509bba8e682e9480f6f..78923d2323c694fab3c779181f630b44c89c5bcc 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -59,7 +59,6 @@ nfc-llcp-limit-size-of-sdp-uri.patch
 mac80211-round-ieee80211_tx_status_headroom-up-to-multiple-of-4.patch
 md-raid10-fix-null-deference-in-handle_write_completed.patch
 drm-exynos-fix-comparison-to-bitshift-when-dealing-with-a-mask.patch
-drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
 locking-xchg-alpha-add-unconditional-memory-barrier-to-cmpxchg.patch
 kernel-relay.c-limit-kmalloc-size-to-kmalloc_max_size.patch
 s390-cio-fix-return-code-after-missing-interrupt.patch

diff --git a/queue-4.14/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch b/queue-4.14/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
deleted file mode 100644 (file)
index 8095cfe..0000000
--- a/queue-4.14/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Sun May 27 16:52:54 CEST 2018
-From: Markus Elfring <elfring@users.sourceforge.net>
-Date: Thu, 8 Feb 2018 18:42:51 +0100
-Subject: drm/exynos: g2d: Delete an error message for a failed memory allocation in two functions
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 6f0a60298bbbea43ab5e3955913ab19c153076f3 ]
-
-Omit an extra message for a memory allocation failure in these functions.
-
-This issue was detected by using the Coccinelle software.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/exynos/exynos_drm_g2d.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-@@ -286,7 +286,6 @@ static int g2d_init_cmdlist(struct g2d_d
- 
-       node = kcalloc(G2D_CMDLIST_NUM, sizeof(*node), GFP_KERNEL);
-       if (!node) {
--              dev_err(dev, "failed to allocate memory\n");
-               ret = -ENOMEM;
-               goto err;
-       }
-@@ -1358,10 +1357,9 @@ int exynos_g2d_exec_ioctl(struct drm_dev
-               return -EFAULT;
- 
-       runqueue_node = kmem_cache_alloc(g2d->runqueue_slab, GFP_KERNEL);
--      if (!runqueue_node) {
--              dev_err(dev, "failed to allocate memory\n");
-+      if (!runqueue_node)
-               return -ENOMEM;
--      }
-+
-       run_cmdlist = &runqueue_node->run_cmdlist;
-       event_list = &runqueue_node->event_list;
-       INIT_LIST_HEAD(run_cmdlist);

diff --git a/queue-4.14/series b/queue-4.14/series
index e6394f7b097c017c4d2bfedbb1a43076d1bdec8d..23d159deb9728f14863d4ed6196a6ebb4a1a6d0d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -99,7 +99,6 @@ gpu-ipu-v3-prg-fix-device-node-leak-in-ipu_prg_lookup_by_phandle.patch
 md-raid10-fix-null-deference-in-handle_write_completed.patch
 drm-exynos-g2d-use-monotonic-timestamps.patch
 drm-exynos-fix-comparison-to-bitshift-when-dealing-with-a-mask.patch
-drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
 drm-meson-fix-vsync-buffer-update.patch
 arm64-perf-correct-pmuver-probing.patch
 rdma-bnxt_re-unpin-sq-and-rq-memory-if-qp-create-fails.patch

diff --git a/queue-4.4/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch b/queue-4.4/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
deleted file mode 100644 (file)
index d903e3e..0000000
--- a/queue-4.4/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Sun May 27 17:52:22 CEST 2018
-From: Markus Elfring <elfring@users.sourceforge.net>
-Date: Thu, 8 Feb 2018 18:42:51 +0100
-Subject: drm/exynos: g2d: Delete an error message for a failed memory allocation in two functions
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 6f0a60298bbbea43ab5e3955913ab19c153076f3 ]
-
-Omit an extra message for a memory allocation failure in these functions.
-
-This issue was detected by using the Coccinelle software.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/exynos/exynos_drm_g2d.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-@@ -270,7 +270,6 @@ static int g2d_init_cmdlist(struct g2d_d
- 
-       node = kcalloc(G2D_CMDLIST_NUM, sizeof(*node), GFP_KERNEL);
-       if (!node) {
--              dev_err(dev, "failed to allocate memory\n");
-               ret = -ENOMEM;
-               goto err;
-       }
-@@ -1254,10 +1253,9 @@ int exynos_g2d_exec_ioctl(struct drm_dev
-               return -EFAULT;
- 
-       runqueue_node = kmem_cache_alloc(g2d->runqueue_slab, GFP_KERNEL);
--      if (!runqueue_node) {
--              dev_err(dev, "failed to allocate memory\n");
-+      if (!runqueue_node)
-               return -ENOMEM;
--      }
-+
-       run_cmdlist = &runqueue_node->run_cmdlist;
-       event_list = &runqueue_node->event_list;
-       INIT_LIST_HEAD(run_cmdlist);

diff --git a/queue-4.4/series b/queue-4.4/series
index a423319621610c466551537daa33fe90391f1702..27f5c5ca919da9f337e800c043286b8d76f80e1d 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -89,7 +89,6 @@ nfc-llcp-limit-size-of-sdp-uri.patch
 mac80211-round-ieee80211_tx_status_headroom-up-to-multiple-of-4.patch
 md-raid10-fix-null-deference-in-handle_write_completed.patch
 drm-exynos-fix-comparison-to-bitshift-when-dealing-with-a-mask.patch
-drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
 usb-musb-fix-enumeration-after-resume.patch
 locking-xchg-alpha-add-unconditional-memory-barrier-to-cmpxchg.patch
 md-raid5-avoid-string-overflow-warning.patch

diff --git a/queue-4.9/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch b/queue-4.9/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
deleted file mode 100644 (file)
index 2b05384..0000000
--- a/queue-4.9/drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Sun May 27 17:33:38 CEST 2018
-From: Markus Elfring <elfring@users.sourceforge.net>
-Date: Thu, 8 Feb 2018 18:42:51 +0100
-Subject: drm/exynos: g2d: Delete an error message for a failed memory allocation in two functions
-
-From: Markus Elfring <elfring@users.sourceforge.net>
-
-[ Upstream commit 6f0a60298bbbea43ab5e3955913ab19c153076f3 ]
-
-Omit an extra message for a memory allocation failure in these functions.
-
-This issue was detected by using the Coccinelle software.
-
-Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/exynos/exynos_drm_g2d.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
-@@ -286,7 +286,6 @@ static int g2d_init_cmdlist(struct g2d_d
- 
-       node = kcalloc(G2D_CMDLIST_NUM, sizeof(*node), GFP_KERNEL);
-       if (!node) {
--              dev_err(dev, "failed to allocate memory\n");
-               ret = -ENOMEM;
-               goto err;
-       }
-@@ -1358,10 +1357,9 @@ int exynos_g2d_exec_ioctl(struct drm_dev
-               return -EFAULT;
- 
-       runqueue_node = kmem_cache_alloc(g2d->runqueue_slab, GFP_KERNEL);
--      if (!runqueue_node) {
--              dev_err(dev, "failed to allocate memory\n");
-+      if (!runqueue_node)
-               return -ENOMEM;
--      }
-+
-       run_cmdlist = &runqueue_node->run_cmdlist;
-       event_list = &runqueue_node->event_list;
-       INIT_LIST_HEAD(run_cmdlist);

diff --git a/queue-4.9/series b/queue-4.9/series
index 8c6312152c6fc185dd614f8f0be8132dd8841ea9..4f504b2580adc95e41a895a5ef1283186d0b4c7c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -120,7 +120,6 @@ mac80211-do-not-disconnect-on-invalid-operating-class.patch
 md-raid10-fix-null-deference-in-handle_write_completed.patch
 drm-exynos-g2d-use-monotonic-timestamps.patch
 drm-exynos-fix-comparison-to-bitshift-when-dealing-with-a-mask.patch
-drm-exynos-g2d-delete-an-error-message-for-a-failed-memory-allocation-in-two-functions.patch
 locking-xchg-alpha-add-unconditional-memory-barrier-to-cmpxchg.patch
 md-raid5-avoid-string-overflow-warning.patch
 kernel-relay.c-limit-kmalloc-size-to-kmalloc_max_size.patch