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

Chuck Ebbert cebbert at fedoraproject.org
Thu Feb 24 01:20:08 UTC 2011


commit a8bce03c83bc3dd3238bd40a7633a7653a1e9251
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Wed Feb 23 20:21:27 2011 -0500

    Linux 2.6.38-rc6-git2

 kernel.spec                             |   13 +++++--------
 sources                                 |    1 +
 usb-sierra-add-airprime-direct-ip.patch |   30 ------------------------------
 3 files changed, 6 insertions(+), 38 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a3fb4be..d5c04d6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -733,9 +733,6 @@ Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
 
 Patch12438: ath5k-fix-fast-channel-change.patch
 
-# rhbz#676860
-Patch12441: usb-sierra-add-airprime-direct-ip.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1351,9 +1348,6 @@ ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
 # rhbz#672778
 ApplyPatch ath5k-fix-fast-channel-change.patch
 
-# rhbz#676860
-ApplyPatch usb-sierra-add-airprime-direct-ip.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1957,6 +1951,9 @@ fi
 # and build.
 
 %changelog
+* Wed Feb 23 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc6.git2.1
+- Linux 2.6.38-rc6-git2
+
 * Wed Feb 23 2011 Ben Skeggs <bskeggs at redhat.com> 2.6.38-0.rc6.git0.2
 - nouveau: nv4x pciegart fixes, nvc0 accel improvements
 
diff --git a/sources b/sources
index 5851b56..8491e17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 c8ee37b4fdccdb651e0603d35350b434  linux-2.6.37.tar.bz2
 7f88891e35d060b8f1f436cf05125c36  patch-2.6.38-rc6.bz2
+3ddbe38f2ca6ae526dd0017fafdf846a  patch-2.6.38-rc6-git2.bz2


More information about the scm-commits mailing list