summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-07 11:25:51 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-07 11:25:51 -0500
commitea8a97de392f5812bf340e217ae7907762c94917 (patch)
treed7d8c79e5ecf4d0502918f2825b3e2121acb0e6c /kernel.spec
parent05e763b50e0db1ef9c00a211e3c6a92f5032190a (diff)
downloadkernel-ea8a97de392f5812bf340e217ae7907762c94917.tar.gz
kernel-ea8a97de392f5812bf340e217ae7907762c94917.tar.xz
kernel-ea8a97de392f5812bf340e217ae7907762c94917.zip
Linux 3.1-git7 (upstream 31555213f)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec
index 6c240e481..1feb2f816 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 6
+%define gitrev 7
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -691,10 +691,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch13002: revert-efi-rtclock.patch
Patch13003: efi-dont-map-boot-services-on-32bit.patch
-Patch13009: hvcs_pi_buf_alloc.patch
-
-Patch13013: powerpc-Fix-deadlock-in-icswx-code.patch
-
Patch20000: utrace.patch
# Flattened devicetree support
@@ -1321,11 +1317,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
ApplyPatch revert-efi-rtclock.patch
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
-
-ApplyPatch hvcs_pi_buf_alloc.patch
-
-ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
-
# utrace.
ApplyPatch utrace.patch
@@ -2035,6 +2026,10 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Nov 07 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-git7
+- Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789)
+
* Fri Nov 04 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-git6