remove efi patch from 3.4 and 3.6, it was applied already

diff --git a/queue-3.4/efi-build-efi-stub-with-efi-appropriate-options.patch b/queue-3.4/efi-build-efi-stub-with-efi-appropriate-options.patch
deleted file mode 100644 (file)
index f8617d5..0000000
--- a/queue-3.4/efi-build-efi-stub-with-efi-appropriate-options.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9dead5bbb825d7c25c0400e61de83075046322d0 Mon Sep 17 00:00:00 2001
-From: Matthew Garrett <mjg@redhat.com>
-Date: Thu, 26 Jul 2012 18:00:00 -0400
-Subject: efi: Build EFI stub with EFI-appropriate options
-
-From: Matthew Garrett <mjg@redhat.com>
-
-commit 9dead5bbb825d7c25c0400e61de83075046322d0 upstream.
-
-We can't assume the presence of the red zone while we're still in a boot
-services environment, so we should build with -fno-red-zone to avoid
-problems. Change the size of wchar at the same time to make string handling
-simpler.
-
-Signed-off-by: Matthew Garrett <mjg@redhat.com>
-Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-Cc: Daniel Vacek <neelx.g@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/x86/boot/compressed/Makefile |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -31,6 +31,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)
- $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
- $(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
- 
-+$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
-+$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
-+
- ifeq ($(CONFIG_EFI_STUB), y)
-       VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
- endif

diff --git a/queue-3.4/series b/queue-3.4/series
index 9cfe203733e5152f6354250601f77206a471ab65..b517a643dbab885450a265e9905c8274529aec1f 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -15,6 +15,5 @@ xen-x86-don-t-corrupt-eip-when-returning-from-a-signal-handler.patch
 usb-cdc-acm-fix-pipe-type-of-write-endpoint.patch
 usb-acm-fix-the-computation-of-the-number-of-data-bits.patch
 usb-host-xhci-new-system-added-for-compliance-mode-patch-on-sn65lvpe502cp.patch
-efi-build-efi-stub-with-efi-appropriate-options.patch
 usb-option-blacklist-net-interface-on-zte-devices.patch
 usb-option-add-more-zte-devices.patch

diff --git a/queue-3.6/efi-build-efi-stub-with-efi-appropriate-options.patch b/queue-3.6/efi-build-efi-stub-with-efi-appropriate-options.patch
deleted file mode 100644 (file)
index f8617d5..0000000
--- a/queue-3.6/efi-build-efi-stub-with-efi-appropriate-options.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9dead5bbb825d7c25c0400e61de83075046322d0 Mon Sep 17 00:00:00 2001
-From: Matthew Garrett <mjg@redhat.com>
-Date: Thu, 26 Jul 2012 18:00:00 -0400
-Subject: efi: Build EFI stub with EFI-appropriate options
-
-From: Matthew Garrett <mjg@redhat.com>
-
-commit 9dead5bbb825d7c25c0400e61de83075046322d0 upstream.
-
-We can't assume the presence of the red zone while we're still in a boot
-services environment, so we should build with -fno-red-zone to avoid
-problems. Change the size of wchar at the same time to make string handling
-simpler.
-
-Signed-off-by: Matthew Garrett <mjg@redhat.com>
-Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-Cc: Daniel Vacek <neelx.g@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/x86/boot/compressed/Makefile |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -31,6 +31,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)
- $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
- $(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
- 
-+$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
-+$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
-+
- ifeq ($(CONFIG_EFI_STUB), y)
-       VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
- endif

diff --git a/queue-3.6/series b/queue-3.6/series
index 7bf081d02b2f908b3c13eb516674dfd96f6e261f..9048fb99d8a962b01fd26f0ac8938d33b8ae18c8 100644 (file)
--- a/queue-3.6/series
+++ b/queue-3.6/series
@@ -40,7 +40,6 @@ usb-ti_usb_3410_5052-fix-port-data-memory-leak.patch
 usb-kl5kusb105-fix-port-data-memory-leak.patch
 usb-io_edgeport-fix-port-data-memory-leak.patch
 usb-keyspan_pda-fix-port-data-memory-leak.patch
-efi-build-efi-stub-with-efi-appropriate-options.patch
 usb-option-blacklist-net-interface-on-zte-devices.patch
 usb-option-add-more-zte-devices.patch
 usb-dwc3-gadget-fix-endpoint-always-busy-bug.patch