reorder the drm patches to prevent a build error.

diff --git a/queue-4.4/efi-esrt-use-memunmap-instead-of-kfree-to-free-the-remapping.patch b/queue-4.4/efi-esrt-use-memunmap-instead-of-kfree-to-free-the-remapping.patch
deleted file mode 100644 (file)
index 8fe38a5..0000000
--- a/queue-4.4/efi-esrt-use-memunmap-instead-of-kfree-to-free-the-remapping.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 89c5a2d34bda58319e3075e8e7dd727ea25a435c Mon Sep 17 00:00:00 2001
-From: Pan Bian <bianpan2016@163.com>
-Date: Wed, 6 Dec 2017 09:50:09 +0000
-Subject: efi/esrt: Use memunmap() instead of kfree() to free the remapping
-
-From: Pan Bian <bianpan2016@163.com>
-
-commit 89c5a2d34bda58319e3075e8e7dd727ea25a435c upstream.
-
-The remapping result of memremap() should be freed with memunmap(), not kfree().
-
-Signed-off-by: Pan Bian <bianpan2016@163.com>
-Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Cc: H. Peter Anvin <hpa@zytor.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Matt Fleming <matt@codeblueprint.co.uk>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: linux-efi@vger.kernel.org
-Link: http://lkml.kernel.org/r/20171206095010.24170-3-ard.biesheuvel@linaro.org
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/firmware/efi/esrt.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/firmware/efi/esrt.c
-+++ b/drivers/firmware/efi/esrt.c
-@@ -16,6 +16,7 @@
- #include <linux/device.h>
- #include <linux/efi.h>
- #include <linux/init.h>
-+#include <linux/io.h>
- #include <linux/kernel.h>
- #include <linux/kobject.h>
- #include <linux/list.h>
-@@ -442,7 +443,7 @@ err_remove_group:
- err_remove_esrt:
-       kobject_put(esrt_kobj);
- err:
--      kfree(esrt);
-+      memunmap(esrt);
-       esrt = NULL;
-       return error;
- }

diff --git a/queue-4.4/series b/queue-4.4/series
index 8488de991634fdc01021001582aaf37a44c8d8ba..16eb42c020ec1a0bfe3deadbbd44e4ff352d487f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -13,7 +13,6 @@ scsi-dma-mapping-always-provide-dma_get_cache_alignment.patch
 scsi-use-dma_get_cache_alignment-as-minimum-dma-alignment.patch
 scsi-libsas-align-sata_device-s-rps_resp-on-a-cacheline.patch
 efi-move-some-sysfs-files-to-be-read-only-by-root.patch
-efi-esrt-use-memunmap-instead-of-kfree-to-free-the-remapping.patch
 asn.1-fix-out-of-bounds-read-when-parsing-indefinite-length-item.patch
 asn.1-check-for-error-from-asn1_op_end__act-actions.patch
 x.509-reject-invalid-bit-string-for-subjectpublickey.patch
@@ -25,6 +24,7 @@ alsa-usb-audio-add-check-return-value-for-usb_string.patch
 iommu-vt-d-fix-scatterlist-offset-handling.patch
 s390-fix-compat-system-call-table.patch
 kdb-fix-handling-of-kallsyms_symbol_next-return-value.patch
+drm-extra-printk-wrapper-macros.patch
 drm-exynos-gem-drop-noncontig-flag-for-buffers-allocated-without-iommu.patch
 media-dvb-i2c-transfers-over-usb-cannot-be-done-from-stack.patch
 arm64-kvm-fix-vttbr_baddr_mask-bug_on-off-by-one.patch
@@ -36,7 +36,6 @@ scsi-storvsc-workaround-for-virtual-dvd-scsi-version.patch
 thp-reduce-indentation-level-in-change_huge_pmd.patch
 thp-fix-madv_dontneed-vs.-numa-balancing-race.patch
 mm-drop-unused-pmdp_huge_get_and_clear_notify.patch
-drm-extra-printk-wrapper-macros.patch
 revert-drm-armada-fix-compile-fail.patch
 revert-spi-spi_fsl_dspi-should-depend-on-has_dma.patch
 revert-s390-kbuild-enable-modversions-for-symbols-exported-from-asm.patch