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

[myoung]

commit 685bfa9afb3aed7f16573f88511502b491aac689
Merge: f50d287 06c3e5f
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Feb 8 21:20:39 2011 +0000

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

 ath5k-fix-fast-channel-change.patch      |  213 ++++++++++++++++++++++++++++++
 can-softing-depend-on-iomem.patch        |   17 ---
 config-x86_64-generic                    |    2 +
 hfsplus-01-dont-leak-buffer.patch        |   24 ----
 hfsplus-02-fill-super-skip-cleanup.patch |   38 ------
 hfsplus-03-zero-vhdr-on-free.patch       |   39 ------
 hfsplus-04-check-for-vhdr.patch          |   28 ----
 kernel.spec                              |   48 ++++---
 sources                                  |    2 +-
 9 files changed, 245 insertions(+), 166 deletions(-)
---
diff --cc kernel.spec
index fcbde95,c1cdd78..fbb5588
--- a/kernel.spec
+++ b/kernel.spec
@@@ -737,23 -731,8 +737,17 @@@ Patch12303: dmar-disable-when-ricoh-mul
  
  Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
  
- Patch12430: can-softing-depend-on-iomem.patch
- 
- # rhbz#673857
- Patch12432: hfsplus-01-dont-leak-buffer.patch
- Patch12433: hfsplus-02-fill-super-skip-cleanup.patch
- Patch12434: hfsplus-03-zero-vhdr-on-free.patch
- Patch12435: hfsplus-04-check-for-vhdr.patch
+ Patch12438: ath5k-fix-fast-channel-change.patch
  
 +# Xen patches
 +# git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git branches
 +Patch20000: xen.next-2.6.38.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
@@@ -1366,22 -1345,9 +1360,15 @@@ ApplyPatch dmar-disable-when-ricoh-mult
  # rhbz#662344,600690
  ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
  
- # Fix build failure on s390
- # accepted upstream
- ApplyPatch can-softing-depend-on-iomem.patch
- 
- # rhbz#673857
- ApplyPatch hfsplus-01-dont-leak-buffer.patch
- ApplyPatch hfsplus-02-fill-super-skip-cleanup.patch
- ApplyPatch hfsplus-03-zero-vhdr-on-free.patch
- ApplyPatch hfsplus-04-check-for-vhdr.patch
+ # rhbz#672778
+ ApplyPatch ath5k-fix-fast-channel-change.patch
  
 +# Xen patches
 +ApplyPatch xen.next-2.6.38.patch
 +#ApplyPatch xen.upstream.core.patch
 +#ApplyPatch xen.pcifront.fixes.patch
 +ApplyPatch xen.pvhvm.fixes.patch
 +
  # END OF PATCH APPLICATIONS
  
  %endif
@@@ -1994,10 -1960,30 +1981,33 @@@ f
  #                 ||----w |
  #                 ||     ||
  %changelog
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.38-0.rc4.git0.2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Mon Feb 07 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc4.git0.1
+ - Linux 2.6.38-rc4
+ 
+ * Fri Feb 04 2011 Chuck Ebbert <cebbert at redhat.com>  2.6.38-0.rc3.git4.1
+ - Linux 2.6.38-rc3-git4
+ 
+ * Thu Feb 03 2011 Chuck Ebbert <cebbert at redhat.com>
+ - Linux 2.6.38-rc3-git3
+ - Enable Advansys SCSI driver on x86_64 (#589115)
+ 
+ * Thu Feb 03 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc3.git2.1
+ - Linux 2.6.38-rc3-git2 snapshot
+ - [sgruszka] ath5k: fix fast channel change (#672778)
+ 
+ * Wed Feb 02 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc3.git1.1
+ - Linux 2.6.38-rc3-git1 snapshot.
+ 
+ * Wed Feb 02 2011 Chuck Ebbert <cebbert at redhat.com>
+ - Fix autoload of atl1c driver for latest hardware (#607499)
+ 
 +* Tue Feb 02 2011 Michael Young <m.a.young at durham.ac.uk>
 +- Update xen.next-2.6.38 and xen.pvhvm.fixes patches
 +
- * Mon Feb 01 2011 Chuck Ebbert <cebbert at redhat.com>
+ * Tue Feb 01 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc3.git0.1
  - Linux 2.6.38-rc3
  - Try to fix some obvious bugs in hfsplus mount failure handling (#673857)