[kernel/f18] Linux 3.6.2

[Justin M. Forbes]

commit bf61942c621833c0ad24485bb91340939c177185
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Mon Oct 15 08:25:35 2012 -0500

    Linux 3.6.2

 kernel.spec                               |   13 ++---
 powerpc-fix-VMX-fix-for-memcpy-case.patch |   97 -----------------------------
 secure-boot-20120924.patch                |   34 ----------
 sources                                   |    2 +-
 4 files changed, 6 insertions(+), 140 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index fe6bef9..c6444b6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -74,7 +74,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -757,9 +757,6 @@ Patch22066: virtio-scsi-Initialize-scatterlist-structure.patch
 #rhbz 846037
 Patch22067: selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch
 
-#rhbz 862420
-Patch22068: powerpc-fix-VMX-fix-for-memcpy-case.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1468,9 +1465,6 @@ ApplyPatch virtio-scsi-Initialize-scatterlist-structure.patch
 #rhbz 846037
 ApplyPatch selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch
 
-#rhbz 862420
-ApplyPatch powerpc-fix-VMX-fix-for-memcpy-case.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2323,6 +2317,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Oct 15 2012 Justin M. Forbes <jforbes at redhat.com> 3.6.2-1
+- Linux 3.6.2
+
 * Thu Oct 11 2012 Peter Robinson <pbrobinson at fedoraproject.org> 3.6.1-2
 - Update ARM config for missing newoption items
 
diff --git a/secure-boot-20120924.patch b/secure-boot-20120924.patch
index a9c63de..54825ef 100644
--- a/secure-boot-20120924.patch
+++ b/secure-boot-20120924.patch
@@ -650,40 +650,6 @@ index 93978d5..e3e5f8c 100644
 1.7.11.4
 
 
-From 294d339c63b0f67a362efaa62713f26d9f496da8 Mon Sep 17 00:00:00 2001
-From: Matthew Garrett <mjg at redhat.com>
-Date: Thu, 26 Jul 2012 18:00:00 -0400
-Subject: [PATCH 13/14] efi: Build EFI stub with EFI-appropriate options
-
-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 at redhat.com>
----
- arch/x86/boot/compressed/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index e398bb5..8a84501 100644
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -28,6 +28,9 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
- 	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \
- 	$(obj)/piggy.o
- 
-+$(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
--- 
-1.7.11.4
-
-
-
 From 1cc529e97756554953187fe48b9b8cf0e24b9bc7 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer at redhat.com>
 Date: Fri, 5 Oct 2012 10:12:48 -0400
diff --git a/sources b/sources
index 152630c..47fce40 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-775f1389a934512341726f9b4aeaf661  patch-3.6.1.xz
+ad1020c82a71ee1ef2416a0d12e724df  patch-3.6.2.xz