summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmartin@redhat.com>2011-07-04 19:57:04 -0400
committerKyle McMartin <kmcmartin@redhat.com>2011-07-04 20:27:46 -0400
commit99ca0896f908fea899a495785921ff851b831abb (patch)
tree5172c6731abecd1e78564de71ae4420898a03961
parentd2e2953beada4d05ec8a38b14c3a55870cca096d (diff)
downloadkernel-99ca0896f908fea899a495785921ff851b831abb.tar.gz
kernel-99ca0896f908fea899a495785921ff851b831abb.tar.xz
kernel-99ca0896f908fea899a495785921ff851b831abb.zip
linux 3.0-rc6
CONFIG_SCSI_ISCI=m
-rw-r--r--config-generic1
-rw-r--r--kernel.spec10
-rw-r--r--sources3
3 files changed, 9 insertions, 5 deletions
diff --git a/config-generic b/config-generic
index c286c540d..28d710cd5 100644
--- a/config-generic
+++ b/config-generic
@@ -453,6 +453,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SRP=m
CONFIG_SCSI_SRP_ATTRS=m
CONFIG_SCSI_TGT=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_DH=y
CONFIG_SCSI_DH_RDAC=m
diff --git a/kernel.spec b/kernel.spec
index 1aa731985..dc927c670 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -83,9 +83,9 @@ Summary: The Linux kernel
# % define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
%define upstream_sublevel 0
# The rc snapshot level
-%define rcrev 5
+%define rcrev 6
# The git snapshot level
-%define gitrev 5
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}
%endif
@@ -531,7 +531,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4
%endif
# Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc5.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc6.tar.bz2
Source11: genkey
Source14: find-provides
@@ -1878,6 +1878,10 @@ fi
# and build.
%changelog
+* Mon Jul 04 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc6.git0.1
+- Linux 3.0-rc6
+- [generic] SCSI_ISCI=m, because why not
+
* Sat Jul 02 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc5.git5.1
- Linux 3.0-rc5-git5
diff --git a/sources b/sources
index f2fc652b1..52eca05a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-02c37ab34ca73f3ff8f6c4963f0e7f1f linux-3.0-rc5.tar.bz2
-e17153ef0d8c7a42aaa1455f7709f1df patch-3.0-rc5-git5.bz2
+d34fc8bbce141244d2dceb6c23d50ca8 linux-3.0-rc6.tar.bz2