summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-02-01 12:38:03 -0500
committerChuck Ebbert <cebbert@redhat.com>2011-02-01 12:38:03 -0500
commit580ae71e04fa304aa5040ff56c18d860e893e467 (patch)
treefd4cf645359af63acce7b4bd51e8e3ee154e2bd5 /kernel.spec
parent285227b68c8212a9b9bd37049335510dcff3a5ed (diff)
downloadkernel-580ae71e04fa304aa5040ff56c18d860e893e467.tar.gz
kernel-580ae71e04fa304aa5040ff56c18d860e893e467.tar.xz
kernel-580ae71e04fa304aa5040ff56c18d860e893e467.zip
Linux 2.6.38-rc3
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec10
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index d3d6013c7..adff54e13 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,9 +82,9 @@ 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 2
+%define rcrev 3
# The git snapshot level
-%define gitrev 9
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -733,8 +733,6 @@ Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
Patch12430: can-softing-depend-on-iomem.patch
-Patch12431: nfs-2.6.38-bugfixes.patch
-
# rhbz#673857
Patch12432: hfsplus-01-dont-leak-buffer.patch
Patch12433: hfsplus-02-fill-super-skip-cleanup.patch
@@ -1354,10 +1352,9 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
# Fix build failure on s390
+# accepted upstream
ApplyPatch can-softing-depend-on-iomem.patch
-ApplyPatch nfs-2.6.38-bugfixes.patch
-
# rhbz#673857
ApplyPatch hfsplus-01-dont-leak-buffer.patch
ApplyPatch hfsplus-02-fill-super-skip-cleanup.patch
@@ -1977,6 +1974,7 @@ fi
# || ||
%changelog
* Mon Feb 01 2011 Chuck Ebbert <cebbert@redhat.com>
+- Linux 2.6.38-rc3
- Try to fix some obvious bugs in hfsplus mount failure handling (#673857)
* Mon Jan 31 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc2.git9.1