[kernel] update to snapshot 2.6.38-rc2-git3
Kyle McMartin
kyle at fedoraproject.org
Tue Jan 25 18:19:58 UTC 2011
commit 84056ee1b86b6b8a96e32e54acf287912ada63df
Author: Kyle McMartin <kyle at redhat.com>
Date: Tue Jan 25 13:19:18 2011 -0500
update to snapshot 2.6.38-rc2-git3
fix context in perf-gcc460-build-fixes.patch
kernel.spec | 8 ++++++--
perf-gcc460-build-fixes.patch | 2 +-
sources | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 78e3202..e5572b9 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 3
+%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 2
# The git snapshot level
-%define gitrev 1
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1955,6 +1955,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Jan 25 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git3.1
+- Linux 2.6.38-rc2-git3
+- perf-gcc460-build-fixes.patch: fix context from [9486aa38]
+
* Mon Jan 24 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git1.3
- Disable usb/pci/acpi autosuspend goo until it can be checked.
diff --git a/perf-gcc460-build-fixes.patch b/perf-gcc460-build-fixes.patch
index 19fbffd..074ab6f 100644
--- a/perf-gcc460-build-fixes.patch
+++ b/perf-gcc460-build-fixes.patch
@@ -119,7 +119,7 @@ index 05344c6..373cfc0 100644
- len = sym->end - sym->start;
-
sprintf(command,
- "objdump --start-address=%#0*Lx --stop-address=%#0*Lx -dS %s",
+ "objdump --start-address=%#0*" PRIx64 " --stop-address=%#0*" PRIx64 " -dS %s",
BITS_PER_LONG / 4, map__rip_2objdump(map, sym->start),
@@ -1295,7 +1292,7 @@ static int __cmd_top(void)
{
diff --git a/sources b/sources
index 2c16061..97cc489 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2
4651b1512e2fba1735713aca8f1007fc patch-2.6.38-rc2.bz2
1edbfed39a74c24b542747f2b97f1e32 patch-2.6.38-rc2-git1.bz2
+a1dc409bd56ddcac0408136e5ba3eb9c patch-2.6.38-rc2-git3.bz2
More information about the scm-commits
mailing list