[kernel] 3.1-rc2-git7 snapshot. Fix provides/obsoletes for cpupowerutils-devel

[Josh Boyer]

commit 0ad3713581707dc6d4d25ab7d148a37b654cff48
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Sat Aug 20 08:13:48 2011 -0400

    3.1-rc2-git7 snapshot.  Fix provides/obsoletes for cpupowerutils-devel

 config-generic                 |    2 ++
 kernel.spec                    |   10 +++++++---
 sources                        |    2 +-
 xen-blkfront-name-adjust.patch |   30 ------------------------------
 4 files changed, 10 insertions(+), 34 deletions(-)
---
diff --git a/config-generic b/config-generic
index 443b2c1..38e0900 100644
--- a/config-generic
+++ b/config-generic
@@ -359,6 +359,7 @@ CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_OSD=m
@@ -375,6 +376,7 @@ CONFIG_BLK_DEV_DELKIN=m
 # CONFIG_BLK_DEV_TC86C001 is not set
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
 
diff --git a/kernel.spec b/kernel.spec
index 4d4ed26..8a29ad2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 5
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -678,7 +678,6 @@ Patch800: linux-2.6-crash-driver.patch
 
 # virt + ksm patches
 Patch1555: fix_xen_guest_on_old_EC2.patch
-Patch1556: xen-blkfront-name-adjust.patch
 
 # DRM
 
@@ -823,6 +822,8 @@ Summary: Assortment of tools for the Linux kernel
 Group: Development/System
 License: GPLv2
 Requires: kernel-tools = %{version}-%{release}
+Provides:  cpupowerutils-devel = 1:009-0.6.p1
+Obsoletes: cpupowerutils-devel < 1:009-0.6.p1
 %description -n kernel-tools-devel
 This package contains the development files for the tools/ directory from
 the kernel source.
@@ -1311,7 +1312,6 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch
 
 # Assorted Virt Fixes
 ApplyPatch fix_xen_guest_on_old_EC2.patch
-ApplyPatch xen-blkfront-name-adjust.patch
 
 # DRM core
 
@@ -2074,6 +2074,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Aug 20 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.1-rc2-git7
+- Add a provides/obsoletes for cpupowerutils-devel
+
 * Fri Aug 19 2011 Josh Boyer <jwboyer at redhat.com>
 - Add patch from upstream to fix 64-bit divide error in btrfs
 
diff --git a/sources b/sources
index 3ad55db..c60442b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
 f358c354ab6d3b0da1265b504f85ec50  patch-3.1-rc2.bz2
-93c566575ae1dc33be4bc345177e4a7d  patch-3.1-rc2-git5.bz2
+a617a4b89580d5e4e5be5033f8c3285b  patch-3.1-rc2-git7.bz2