Move power-x86-destdir.patch to apply on vanilla kernels (thanks knurd)

This commit is contained in:
Josh Boyer 2012-10-30 14:01:39 -04:00
parent c84ab99ae9
commit 8e8972af61
1 changed files with 7 additions and 4 deletions

View File

@ -633,6 +633,8 @@ Patch04: linux-2.6-compile-fixes.patch
# build tweak for build ID magic, even for -vanilla
Patch05: linux-2.6-makefile-after_link.patch
Patch06: power-x86-destdir.patch
%if !%{nopatches}
@ -727,8 +729,6 @@ Patch21010: arm-highbank-sata-fix.patch
Patch21020: arm-smdk310-regulator-fix.patch
Patch21021: arm-origen-regulator-fix.patch
Patch21094: power-x86-destdir.patch
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@ -1320,6 +1320,8 @@ ApplyPatch linux-2.6-makefile-after_link.patch
#
ApplyOptionalPatch linux-2.6-compile-fixes.patch
ApplyPatch power-x86-destdir.patch
%if !%{nopatches}
# revert patches from upstream that conflict or that we get via other means
@ -1451,8 +1453,6 @@ ApplyPatch ips-noirq.patch
ApplyPatch i82975x-edac-fix.patch
ApplyPatch power-x86-destdir.patch
#rhbz 754518
ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@ -2360,6 +2360,9 @@ fi
# '-' | |
# '-'
%changelog
* Tue Oct 30 2012 Josh Boyer <jwboyer@redhat.com>
- Move power-x86-destdir.patch to apply on vanilla kernels (thanks knurd)
* Mon Oct 29 2012 Justin M. Forbes <jforbes@redhat.com>
- Uprobes backports from upstream