[kernel/f14/master] Linux 2.6.35.6
Kyle McMartin
kyle at fedoraproject.org
Mon Sep 27 02:43:11 UTC 2010
commit 05f615c82e8f2cd784196df9ad0fb9fe78209b25
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date: Sun Sep 26 22:43:03 2010 -0400
Linux 2.6.35.6
.gitignore | 1 +
kernel.spec | 10 ++++++++--
sources | 3 +--
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2fd413..473566e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ patch-*.bz2
clog
*.rpm
kernel-2.6.*/
+/patch-2.6.35.6.bz2
diff --git a/kernel.spec b/kernel.spec
index 9f2df69..9a8448a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
-%global baserelease 33
+%global baserelease 34
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# Do we have a -stable update to apply?
%define stable_update 6
# Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -1991,6 +1991,12 @@ fi
# and build.
%changelog
+* Mon Sep 27 2010 Kyle McMartin <kyle at redhat.com> 2.6.35.6-34
+- Linux 2.6.35.6
+- bdi-fix-warnings-in-__mark_inode_dirty-for-dev-zero-and-friends.patch was
+ dropped, should fix the inode_to_bdi WARN_ON triggering for a bunch of
+ people.
+
* Sat Sep 25 2010 Chuck Ebbert <kyle at redhat.com> 2.6.35.6-33.rc1
- Linux 2.6.35.6-rc1
- Comment out merged patches:
diff --git a/sources b/sources
index 9f2ca48..53ae0ac 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
-5bf1900e4ea72b8c65f4f7aae0a28d14 patch-2.6.35.5.bz2
-bee26a90f42ded49a026f67f83443206 patch-2.6.35.6-rc1.bz2
+0dbd6ebf242a1428d4161bc32b1306fa patch-2.6.35.6.bz2
More information about the scm-commits
mailing list