[kernel/f16] Linux 3.1.3-rc1

Chuck Ebbert cebbert at fedoraproject.org
Wed Nov 23 05:52:58 UTC 2011


commit 9de42b3c88ea529ed96861576e9fd457b0577807
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Wed Nov 23 00:50:53 2011 -0500

    Linux 3.1.3-rc1
    
    Comment out merged patches:
    usb-add-quirk-for-logitech-webcams.patch
    ip6_tunnel-copy-parms.name-after-register_netdevice.patch

 kernel.spec |   14 ++++++++++----
 sources     |    1 +
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 4aa6ba8..cf09158 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,9 +66,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -1409,7 +1409,7 @@ ApplyPatch udlfb-bind-framebuffer-to-interface.patch
 ApplyPatch epoll-limit-paths.patch
 ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
 ApplyPatch block-stray-block-put-after-teardown.patch
-ApplyPatch usb-add-quirk-for-logitech-webcams.patch
+#ApplyPatch usb-add-quirk-for-logitech-webcams.patch
 ApplyPatch HID-wacom-Set-input-bits-before-registration.patch
 
 # rhbz#605888
@@ -1421,7 +1421,7 @@ ApplyPatch efi-dont-map-boot-services-on-32bit.patch
 ApplyPatch hvcs_pi_buf_alloc.patch
 
 #rhbz 751165
-ApplyPatch ip6_tunnel-copy-parms.name-after-register_netdevice.patch
+#ApplyPatch ip6_tunnel-copy-parms.name-after-register_netdevice.patch
 
 ApplyPatch media-dib0700-correct-error-message.patch
 
@@ -2185,6 +2185,12 @@ fi
 # and build.
 
 %changelog
+* Wed Nov 23 2011 Chuck Ebbert <cebbert at redhat.com> 3.1.3-0.rc1.1
+- Linux 3.1.3-rc1
+- Comment out merged patches:
+  usb-add-quirk-for-logitech-webcams.patch
+  ip6_tunnel-copy-parms.name-after-register_netdevice.patch
+
 * Tue Nov 22 2011 Chuck Ebbert <cebbert at redhat.com> 3.1.2-1
 - Linux 3.1.2
 
diff --git a/sources b/sources
index f8c57b8..94640ad 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
 6693d8c42055f83f5701d9b65d47208a  compat-wireless-3.2-rc1-1.tar.bz2
 7487d8e6f00c077f6e15d6f4f9947c30  patch-3.1.2.bz2
+756c229f0565dd6073605c8654fee4b9  patch-3.1.3-rc1.bz2


More information about the scm-commits mailing list