[kernel/rawhide/user/steved/pnfs-rawhide: 169/169] Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/

[Steve Dickson]

commit faccae1ee348900ad29ade6b397b4d9e11a6fc97
Merge: 48d247d 44abf4a
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Jan 28 08:59:11 2011 -0500

    Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide
    
    Conflicts:
    	kernel.spec
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 kernel.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index c1bbaa0,32a8492..0e99ad8
--- a/kernel.spec
+++ b/kernel.spec
@@@ -727,22 -713,21 +727,26 @@@ Patch12203: linux-2.6-usb-pci-autosuspe
  Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
  Patch12205: runtime_pm_fixups.patch
  
 -Patch12225: pci-crs-fixes.patch
 +Patch12303: dmar-disable-when-ricoh-multifunction.patch
  
 -Patch12300: btusb-macbookpro-7-1.patch
 -Patch12301: btusb-macbookpro-6-2.patch
 +Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
  
 -Patch12302: pnpacpi-cope-with-invalid-device-ids.patch
 +Patch30000: pnfs-all-2.6.36-rc3-2010-08-30.patch
 +Patch30001: linux-2.6-pnfs-compile.patch
 +Patch30002: linux-2.6.35-inline.patch
  
 -Patch12303: dmar-disable-when-ricoh-multifunction.patch
 +Patch30000: pnfs-all-latest.v2.6.36-rc6-f15.patch
 +Patch30001: linux-2.6-pnfs-compile.patch
 +Patch30002: linux-2.6.35-inline.patch
  
 -Patch12305: xhci_hcd-suspend-resume.patch
 +Patch30000: pnfs-all-2.6.36-2010-11-03.patch
 +Patch30001: linux-2.6-pnfs-compile.patch
 +Patch30002: linux-2.6.35-inline.patch
  
+ Patch30000: pnfs-all-2.6.36-2010-11-03.patch
+ Patch30001: linux-2.6-pnfs-compile.patch
+ Patch30002: linux-2.6.35-inline.patch
+ 
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1336,37 -1308,47 +1340,41 @@@ ApplyPatch add-appleir-usb-driver.patc
  
  ApplyPatch neuter_intel_microcode_load.patch
  
 -# try to fix stalls during boot (#530393)
 -ApplyPatch tpm-fix-stall-on-boot.patch
 -
 -# Wacom Bamboo
 -ApplyPatch wacom-01-add-fuzz-parameters-to-features.patch
 -ApplyPatch wacom-02-parse-the-bamboo-device-family.patch
 -ApplyPatch wacom-03-collect-device-quirks-into-single-function.patch
 -ApplyPatch wacom-04-add-support-for-the-bamboo-touch-trackpad.patch
 -ApplyPatch wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch
 -ApplyPatch wacom-06-request-tablet-data-for-bamboo-pens.patch
 -ApplyPatch wacom-07-move-bamboo-touch-irq-to-its-own-function.patch
 -ApplyPatch wacom-08-add-support-for-bamboo-pen.patch
 -ApplyPatch wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch
 +# various fixes for Apple and EFI
 +ApplyPatch apple_backlight.patch
 +ApplyPatch efifb_update.patch
 +ApplyPatch acpi_reboot.patch
 +ApplyPatch efi_default_physical.patch
  
  # Runtime PM
 -ApplyPatch linux-2.6-bluetooth-autosuspend.patch
 -ApplyPatch linux-2.6-uvc-autosuspend.patch
 -ApplyPatch linux-2.6-qcserial-autosuspend.patch
 -ApplyPatch linux-2.6-usb-pci-autosuspend.patch
 -ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch
 -ApplyPatch runtime_pm_fixups.patch
 +ApplyPatch linux-2.6-ehci-check-port-status.patch
 +#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
 +### Broken by implicit notify support & ACPICA rebase
 +###ApplyPatch linux-2.6-enable-more-pci-autosuspend.patch
 +#ApplyPatch runtime_pm_fixups.patch
  
 -# PCI patches to fix problems with _CRS
 -# ( from linux-pci list )
 -ApplyPatch pci-crs-fixes.patch
 +# rhbz#605888
 +ApplyPatch dmar-disable-when-ricoh-multifunction.patch
  
 -ApplyPatch btusb-macbookpro-7-1.patch
 -ApplyPatch btusb-macbookpro-6-2.patch
 +# rhbz#662344,600690
 +ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
  
 -# rhbz#641468
 -ApplyPatch pnpacpi-cope-with-invalid-device-ids.patch
 +ApplyPatch pnfs-all-2.6.36-rc3-2010-08-30.patch
 +ApplyPatch linux-2.6-pnfs-compile.patch
 +ApplyPatch linux-2.6.35-inline.patch
  
 -# rhbz#605888
 -ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 +ApplyPatch pnfs-all-latest.v2.6.36-rc6-f15.patch
 +ApplyPatch linux-2.6-pnfs-compile.patch
 +ApplyPatch linux-2.6.35-inline.patch
  
 -ApplyPatch xhci_hcd-suspend-resume.patch
 +ApplyPatch pnfs-all-2.6.36-2010-11-03.patch 
 +ApplyPatch linux-2.6-pnfs-compile.patch
 +ApplyPatch linux-2.6.35-inline.patch
  
+ ApplyPatch pnfs-all-2.6.36-2010-11-03.patch 
+ ApplyPatch linux-2.6-pnfs-compile.patch
+ ApplyPatch linux-2.6.35-inline.patch
+ 
  # END OF PATCH APPLICATIONS
  
  %endif