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

[myoung]

commit d8422afbce69f25b4faeb83f852934268b945324
Merge: 09bc1b5 89a0c6d
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Jan 25 00:05:34 2011 +0000

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

 debug-tty-print-dev-name.patch |   17 ---
 kernel.spec                    |   40 +++++---
 perf-gcc460-build-fixes.patch  |  227 ++++++++++++++++++++++++++++++++++++++++
 runtime_pm_fixups.patch        |   70 ++++++++----
 sources                        |    1 +
 tpm-fix-stall-on-boot.patch    |   24 ----
 6 files changed, 301 insertions(+), 78 deletions(-)
---
diff --cc kernel.spec
index 5155fb1,f25a461..6adf903
--- a/kernel.spec
+++ b/kernel.spec
@@@ -733,19 -729,8 +733,17 @@@ Patch12205: runtime_pm_fixups.patc
  
  Patch12303: dmar-disable-when-ricoh-multifunction.patch
  
- Patch12401: debug-tty-print-dev-name.patch
- 
  Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.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
@@@ -1977,12 -1953,23 +1972,29 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
+ * Mon Jan 24 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git1.3
+ - Disable usb/pci/acpi autosuspend goo until it can be checked.
+ 
+ * Mon Jan 24 2011 Kyle McMartin <kmcmartin at redhat.com>
+ - debug-tty-print-dev-name.patch: drop, haven't seen any warnings recently.
+ - runtime_pm_fixups.patch: rebase and re-enable, make acpi_power_transition
+    in pci_bind actually do the right thing instead of (likely) always
+    trying to transition to D0.
+ 
+ * Mon Jan 24 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git1.1
+ - Linux 2.6.38-rc2-git1
+ - [e5cce6c1] tpm: fix panic caused by "tpm: Autodetect itpm devices"
+   may fix some boot issues people were having.
+ - tpm-fix-stall-on-boot.patch: upstream.
+ - perf-gcc460-build-fixes.patch: fix build issues with warn-unused-but-set
+   in gcc 4.6.0
+ 
 +* Mon Jan 24 2011 Michael Young <m.a.young at durham.ac.uk>
 +- update to 2.6.38-rc
 +- Strip out upstream or conflicting patches from xen.next-2.6.37.patch
 +  and xen.pcifront.fixes.patch
 +- Add a test patch to fix a crash on boot to xen.pcifront.fixes.patch
 +
  * Sat Jan 22 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git0.1
  - Linux 2.6.38-rc2
  - linux-2.6-serial-460800.patch, drivers/serial => drivers/tty/serial