[kernel/f16] Linux 3.1-rc9
Chuck Ebbert
cebbert at fedoraproject.org
Wed Oct 5 14:50:10 UTC 2011
commit cf2d0ce1776cd25ed54bd4c3b3a43452c22972c2
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Wed Oct 5 10:51:31 2011 -0400
Linux 3.1-rc9
777eb1bf15b8532c396821774bf6451e563438f5.patch | 71 ------------------------
drm-i915-fbc-stfu.patch | 2 +-
kernel.spec | 12 ++--
sources | 2 +-
ucvideo-fix-crash-when-linking-entities.patch | 34 -----------
5 files changed, 7 insertions(+), 114 deletions(-)
---
diff --git a/drm-i915-fbc-stfu.patch b/drm-i915-fbc-stfu.patch
index 7e30dae..9240387 100644
--- a/drm-i915-fbc-stfu.patch
+++ b/drm-i915-fbc-stfu.patch
@@ -89,8 +89,8 @@ index 56a8554..a6d14eb 100644
* display to settle before starting the compression. Note that
* this delay also serves a second purpose: it allows for a
@@ -1800,8 +1783,6 @@ static void intel_update_fbc(struct drm_device *dev)
- struct intel_framebuffer *intel_fb;
struct drm_i915_gem_object *obj;
+ int enable_fbc;
- DRM_DEBUG_KMS("\n");
-
diff --git a/kernel.spec b/kernel.spec
index 6b04665..6bebdec 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 1
+%global baserelease 0
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -82,7 +82,7 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 8
+%define rcrev 9
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@@ -722,7 +722,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch13002: revert-efi-rtclock.patch
Patch13003: efi-dont-map-boot-services-on-32bit.patch
-Patch13005: ucvideo-fix-crash-when-linking-entities.patch
Patch13007: add-macbookair41-keyboard.patch
@@ -736,7 +735,6 @@ Patch20000: utrace.patch
Patch21000: arm-omap-dt-compat.patch
Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
-Patch21010: 777eb1bf15b8532c396821774bf6451e563438f5.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1343,7 +1341,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
ApplyPatch revert-efi-rtclock.patch
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
-ApplyPatch ucvideo-fix-crash-when-linking-entities.patch
ApplyPatch add-macbookair41-keyboard.patch
@@ -1354,8 +1351,6 @@ ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
# utrace.
ApplyPatch utrace.patch
-ApplyPatch 777eb1bf15b8532c396821774bf6451e563438f5.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2057,6 +2052,9 @@ fi
# and build.
%changelog
+* Wed Oct 05 2011 Chuck Ebbert <cebbert at redhat.com> 3.1.0-0.rc9.git0.0
+- Linux 3.1-rc9
+
* Mon Oct 03 2011 Chuck Ebbert <cebbert at redhat.com> 3.1.0-0.rc8.git0.1
- block: Free queue resources at blk_release_queue()
diff --git a/sources b/sources
index 2194c37..e509d01 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
-aae4a0422f4be618fcdbf4bf9de67143 patch-3.1-rc8.bz2
+85fd0d4c9701392b6eb9293035726a02 patch-3.1-rc9.bz2
More information about the scm-commits
mailing list