summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-16 10:28:25 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-16 10:31:40 -0400
commitbc12142e94b6bc3c20e422e596cff4d0426c3be7 (patch)
tree39eaaae2dd0d0cfd3eb3521abd6428e40f05645a /kernel.spec
parent8ffa0afd4c9c71c3ee7ed3b8310bada71259173a (diff)
downloadkernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.gz
kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.xz
kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.zip
Add a few patches that were in f16 but not in rawhide
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 4d62e2944..29dda4e82 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -650,6 +650,7 @@ Patch800: linux-2.6-crash-driver.patch
# virt + ksm patches
Patch1555: fix_xen_guest_on_old_EC2.patch
+Patch1556: xen-blkfront-name-adjust.patch
# DRM
@@ -687,6 +688,9 @@ Patch12022: fix-cdc-ncm-dma-stack-vars.patch
Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
Patch12024: epoll-fix-spurious-lockdep-warnings.patch
Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
+Patch12026: block-stray-block-put-after-teardown.patch
+Patch12027: usb-add-quirk-for-logitech-webcams.patch
+
# Runtime power management
Patch12203: linux-2.6-usb-pci-autosuspend.patch
@@ -695,6 +699,8 @@ Patch12205: runtime_pm_fixups.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
+Patch13003: efi-dont-map-boot-services-on-32bit.patch
+
Patch20000: utrace.patch
%endif
@@ -1233,6 +1239,7 @@ ApplyPatch linux-2.6-e1000-ich9-montevina.patch
# Assorted Virt Fixes
ApplyPatch fix_xen_guest_on_old_EC2.patch
+ApplyPatch xen-blkfront-name-adjust.patch
# DRM core
@@ -1264,6 +1271,8 @@ ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
+ApplyPatch block-stray-block-put-after-teardown.patch
+ApplyPatch usb-add-quirk-for-logitech-webcams.patch
# Runtime PM
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
@@ -1274,6 +1283,8 @@ ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
+ApplyPatch efi-dont-map-boot-services-on-32bit.patch
+
# utrace.
ApplyPatch utrace.patch
@@ -1902,6 +1913,7 @@ fi
%changelog
* Tue Aug 16 2011 Josh Boyer <jwboyer@redhat.com>
- Bring ARM config changes from David Marlin forward
+- Sync a handful of patches from f16
* Mon Aug 15 2011 Josh Boyer <jwboyer@redhat.com>
- Linux-3.1-rc2