[kernel/rawhide/user/myoung/xendom0: 16/17] Merge branch 'master' into rawhide/user/myoung/xendom0

[myoung]

commit 1e71a89379ef8cff3d88ff6a92553fb1bb03b41e
Merge: a9d2ae6 6a82260
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Sat Jan 1 21:28:03 2011 +0000

    Merge branch 'master' into rawhide/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec

 .gitignore                                         |    3 +-
 ...-battery-information-on-notification-0x81.patch |   49 +-
 acpi_reboot.patch                                  |  102 +
 apple_backlight.patch                              |  688 ++++++
 applesmc_update.patch                              | 2293 ++++++++++++++++++++
 config-generic                                     |   11 +-
 config-nodebug                                     |  102 +-
 config-x86-generic                                 |    2 +-
 config-x86_64-generic                              |    4 +-
 efi_default_physical.patch                         |  403 ++++
 efifb_update.patch                                 |  217 ++
 flexcop-fix-xlate_proc_name-warning.patch          |   30 +
 ...-security_d_instantiate-in-d_obtain_alias.patch |   65 +
 kernel.spec                                        |   80 +-
 linux-next-macbook-air-input.patch                 |  185 ++
 net-AF_PACKET-vmalloc.patch                        |  254 +++
 ...se-priv_hw-before-assigning-the-interrupt.patch |   91 -
 sched-cure-more-NO_HZ-load-average-woes.patch      |  273 ---
 sources                                            |    3 +-
 19 files changed, 4402 insertions(+), 453 deletions(-)
---
diff --cc kernel.spec
index 0ef9ea2,cff5226..9966a78
--- a/kernel.spec
+++ b/kernel.spec
@@@ -711,20 -718,10 +720,19 @@@ Patch12401: debug-tty-print-dev-name.pa
  Patch12410: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
  Patch12411: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
  
- # rhbz#650934
- Patch12420: sched-cure-more-NO_HZ-load-average-woes.patch
+ Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
  
- Patch12421: orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
+ Patch12422: net-AF_PACKET-vmalloc.patch
  
 +# Xen patches
 +# git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git branches
 +Patch20000: xen.next-2.6.37.patch
 +#Patch20001: xen.upstream.core.patch
 +# git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git branches
 +Patch20005: xen.pcifront.fixes.patch
 +# git://xenbits.xen.org/people/sstabellini/linux-pvhvm branches
 +#Patch20010: xen.pvhvm.fixes.patch
 +
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1324,18 -1332,12 +1343,18 @@@ ApplyPatch debug-tty-print-dev-name.pat
  ApplyPatch mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
  ApplyPatch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
  
- # rhbz#650934
- ApplyPatch sched-cure-more-NO_HZ-load-average-woes.patch
+ # rhbz#662344,600690
+ ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
  
- # rhbz657864
- ApplyPatch orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch
+ # rhbz#637619
+ ApplyPatch net-AF_PACKET-vmalloc.patch
  
 +# Xen patches
 +ApplyPatch xen.next-2.6.37.patch
 +#ApplyPatch xen.upstream.core.patch
 +ApplyPatch xen.pcifront.fixes.patch
 +#ApplyPatch xen.pvhvm.fixes.patch
 +
  # END OF PATCH APPLICATIONS
  
  %endif
@@@ -1949,9 -1951,43 +1968,46 @@@ f
  #                 ||     ||
  
  %changelog
+ * Thu Dec 23 2010 Kyle McMartin <kyle at redhat.com>
+ - Pull in flexcop procfs rename patch since it's still not upstream. (#664852)
+ 
+ * Tue Dec 21 2010 Kyle McMartin <kyle at redhat.com> 2.6.37.0.rc7.git0.2
+ - Linux 2.6.37-rc7
+ - CONFIG_USB_OTG=n (seems unnecessary?)
+ - Enable release builds until .37 releases in rawhide.
+ 
+ * Sun Dec 19 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc6.git5.1
+ - Linux 2.6.37-rc6-git5
+ - sched-cure-more-NO_HZ-load-average-woes.patch: upstream.
+ 
+ * Sat Dec 18 2010 Kyle McMartin <kyle at redhat.com>
+ - Patch from nhorman against f13:
+   Enhance AF_PACKET to allow non-contiguous buffer alloc (#637619)
+ 
+ * Sat Dec 18 2010 Kyle McMartin <kyle at redhat.com>
+ - Fix SELinux issues with NFS/btrfs and/or xfsdump. (#662344)
+ 
+ * Fri Dec 17 2010 Matthew Garrett <mjg at redhat.com> 2.6.37-0.rc6.git0.3
+ - efi_default_physical.patch: Revert hunk that breaks boot
+ - linux-next-macbook-air-input.patch: Add input support for new Macbook Airs
+ 
+ * Thu Dec 16 2010 Matthew Garrett <mjg at redhat.com> 2.6.37-0.rc6.git0.2
+ - applesmc_update.patch: Make the driver more generic. Should help Apples.
+ - apple_backlight.patch: Make sure that this loads on all hardware.
+ - efifb_update.patch: Fixes for the 11 inch Macbook Air
+ - acpi_reboot.patch: Should make reboot work better on most hardware
+ - efi_default_physical.patch: Some machines dislike EFI virtual mode
+ 
+ * Wed Dec 15 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc6.git0.1
+ - Linux 2.6.37-rc6
+ - Re-activate acpi patch which rejected on the previous commit.
+ 
+ * Wed Dec 15 2010 Kyle McMartin <kyle at redhat.com> 2.6.37-0.rc5.git5.1
+ - 2.6.37-rc5-git5
+ 
 +* Tue Dec 14 2010 Michael Young <m.a.young at durham.ac.uk>
 +- test an irq patch in xen.pcifront.fixes.patch
 +
  * Fri Dec 10 2010 Kyle McMartin <kyle at redhat.com>
  - Another patch from mjg59: Set _OSC supported field correctly (#638912)