[kernel] update to snapshot 3.0-rc6-git6

[Kyle McMartin]

commit e04b212cc5b43cda75aee2b6efa65c9234138713
Author: Kyle McMartin <kyle at redhat.com>
Date:   Sun Jul 10 09:43:44 2011 -0400

    update to snapshot 3.0-rc6-git6
    
    revert CONFIG_X86_RESERVE_LOW=640, it breaks boot.

 config-x86-generic             |    3 +-
 config-x86_64-generic          |    3 +-
 iwlagn-fix-dma-direction.patch |   55 ----------------------------------------
 kernel.spec                    |    9 ++++--
 sources                        |    1 +
 5 files changed, 11 insertions(+), 60 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index a5cf0f0..bd2f93b 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -448,7 +448,7 @@ CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=640
+CONFIG_X86_RESERVE_LOW_64K=y
 
 # CONFIG_CMDLINE_BOOL is not set
 
@@ -529,6 +529,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
 
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_X86_RESERVE_LOW=64
 
 CONFIG_PCH_GBE=m
 CONFIG_PCH_PHUB=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 7700e4e..f4c3c30 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -366,7 +366,7 @@ CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=640
+CONFIG_X86_RESERVE_LOW_64K=y
 
 # CONFIG_CMDLINE_BOOL is not set
 
@@ -444,6 +444,7 @@ CONFIG_IDEAPAD_LAPTOP=m
 
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_X86_RESERVE_LOW=64
 
 CONFIG_PCH_GBE=m
 CONFIG_PCH_PHUB=m
diff --git a/kernel.spec b/kernel.spec
index 99d6407..ba11f1a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}
 %endif
@@ -691,7 +691,6 @@ Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
 Patch12205: runtime_pm_fixups.patch
 
 Patch12303: dmar-disable-when-ricoh-multifunction.patch
-Patch12304: iwlagn-fix-dma-direction.patch
 
 %endif
 
@@ -1266,7 +1265,6 @@ ApplyPatch neuter_intel_microcode_load.patch
 
 # rhbz#605888
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch
-ApplyPatch iwlagn-fix-dma-direction.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1878,6 +1876,11 @@ fi
 # and build.
 
 %changelog
+* Sun Jul 10 2011 Kyle McMartin <kmcmartin at redhat.com> 3.0-0.rc6.git6.1
+- Linux 3.0-rc6-git6
+- iwlagn-fix-dma-direction.patch: drop.
+- Revert CONFIG_X86_RESERVE_LOW=640, it breaks booting on x86_64.
+
 * Thu Jul 07 2011 Dave Jones <davej at redhat.com>
 - Centralise CPU_FREQ options into config-generic.
   Switch to using ondemand by default. (rhbz 713572)
diff --git a/sources b/sources
index 52eca05..ec28a91 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d34fc8bbce141244d2dceb6c23d50ca8  linux-3.0-rc6.tar.bz2
+f993ec3b03c39df3b77a1207a5ce9303  patch-3.0-rc6-git6.bz2