[kernel/f15/master] Linux 2.6.38-rc6-git6

[Chuck Ebbert]

commit a7940a1d09e9aaa481d673143b6a7563d6d0bc62
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Feb 25 20:01:24 2011 -0500

    Linux 2.6.38-rc6-git6
    
    Build in virtio_pci driver so virtio_console will be built-in (#677713)

 config-generic |    4 +---
 kernel.spec    |    6 +++++-
 sources        |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/config-generic b/config-generic
index a15e0fa..c07e5b8 100644
--- a/config-generic
+++ b/config-generic
@@ -427,10 +427,8 @@ CONFIG_BLK_DEV_VIA82CXXX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_HD is not set
 
-CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
diff --git a/kernel.spec b/kernel.spec
index 66123d2..c2e6e9f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 4
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1948,6 +1948,10 @@ fi
 # and build.
 
 %changelog
+* Fri Feb 25 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc6.git6.1
+- Linux 2.6.38-rc6-git6
+- Build in virtio_pci driver so virtio_console will be built-in (#677713)
+
 * Thu Feb 24 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc6.git4.1
 - Linux 2.6.38-rc6-git4
 
diff --git a/sources b/sources
index 88caa67..4cd5b0f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 c8ee37b4fdccdb651e0603d35350b434  linux-2.6.37.tar.bz2
 7f88891e35d060b8f1f436cf05125c36  patch-2.6.38-rc6.bz2
-9a62ea5fbad62e74476ec31a915616f8  patch-2.6.38-rc6-git4.bz2
+417c362da85e0b7221b9f624aa569a71  patch-2.6.38-rc6-git6.bz2