diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-07 11:50:45 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-07 11:50:45 -0500 |
| commit | dee356203f1ec66053a89024b7ea6370814d67b9 (patch) | |
| tree | 325e35fd10457a8ebdfaed493910770ac5521332 /kernel.spec | |
| parent | ea8a97de392f5812bf340e217ae7907762c94917 (diff) | |
| download | kernel-dee356203f1ec66053a89024b7ea6370814d67b9.tar.gz kernel-dee356203f1ec66053a89024b7ea6370814d67b9.tar.xz kernel-dee356203f1ec66053a89024b7ea6370814d67b9.zip | |
Add from git://openlinux.windriver.com/people/paulg/modsplit-post-merge
These fix various build failures from the module.h split out stuff for 3.2
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 1feb2f816..97f502436 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -702,6 +702,8 @@ Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch Patch21070: oom-fix-integer-overflow-of-points.patch +Patch21071: modsplit-post-merge.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1323,6 +1325,8 @@ ApplyPatch utrace.patch #rhbz 750402 ApplyPatch oom-fix-integer-overflow-of-points.patch +ApplyPatch modsplit-post-merge.patch + # END OF PATCH APPLICATIONS %endif @@ -2029,6 +2033,7 @@ fi * Mon Nov 07 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.1-git7 - Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789) +- Add fixes from git://openlinux.windriver.com/people/paulg/modsplit-post-merge * Fri Nov 04 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.1-git6 |