diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-06-22 11:47:42 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-06-22 11:47:42 -0400 |
| commit | e8d34e0ae53138ca0e7d37a4a0f82ea1807f7ce9 (patch) | |
| tree | d0791746706c0e0a4f9f4329e54b08bf310edab7 /kernel.spec | |
| parent | b718a988d5426217902c7790d6aa070b729fbc6a (diff) | |
| download | kernel-e8d34e0ae53138ca0e7d37a4a0f82ea1807f7ce9.tar.gz kernel-e8d34e0ae53138ca0e7d37a4a0f82ea1807f7ce9.tar.xz kernel-e8d34e0ae53138ca0e7d37a4a0f82ea1807f7ce9.zip | |
Add uprobe backports from -tip from Anton Arapov
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 6ee461adc..8b2384b93 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,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 3 +%global baserelease 4 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -713,6 +713,8 @@ Patch14000: hibernate-freeze-filesystems.patch Patch14010: lis3-improve-handling-of-null-rate.patch +Patch20000: uprobes-3.5-tip.patch + # ARM # OMAP Patch21000: arm-omap-3.5-fixes.patch @@ -1413,6 +1415,8 @@ ApplyPatch efi-dont-map-boot-services-on-32bit.patch ApplyPatch lis3-improve-handling-of-null-rate.patch +ApplyPatch uprobes-3.5-tip.patch + ApplyPatch power-x86-destdir.patch ApplyPatch hfsplus-Fix-bless-ioctl-when-used-with-hardlinks.patch @@ -2282,6 +2286,9 @@ fi # ||----w | # || || %changelog +* Fri Jun 22 2012 Josh Boyer <jwboyer@redhat.com> +- Add uprobe backports from -tip from Anton Arapov + * Wed Jun 20 2012 Josh Boyer <jwboyer@redhat.com> - Fix incorrect logic in irqpoll patch |