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

[myoung]

commit ddb95b3a1244f046bb98a7707d124adc52664e04
Merge: 9ff52fd b161e65
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Wed Feb 16 23:01:27 2011 +0000

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

 ...orruption-that-leads-to-memory-corruption.patch |   42 +++++++++++++++++++
 config-generic                                     |    2 +-
 kernel.spec                                        |   44 +++++++++++++++-----
 revert-block-check-bdev-readonly.patch             |   33 +++++++++++++++
 sources                                            |    3 +-
 usb-sierra-add-airprime-direct-ip.patch            |   30 +++++++++++++
 6 files changed, 140 insertions(+), 14 deletions(-)
---
diff --cc kernel.spec
index 4f84cc1,0c6a80c..d49e958
--- a/kernel.spec
+++ b/kernel.spec
@@@ -739,16 -733,14 +739,24 @@@ Patch12421: fs-call-security_d_instanti
  
  Patch12438: ath5k-fix-fast-channel-change.patch
  
+ Patch12440: bridge-fix-mglist-corruption-that-leads-to-memory-corruption.patch
+ 
+ # rhbz#676860
+ Patch12441: usb-sierra-add-airprime-direct-ip.patch
+ 
+ # rhbz#672265
+ Patch12442: revert-block-check-bdev-readonly.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
 +Patch20006: xen.pcifront.next-2.6.38.patch
 +# git://xenbits.xen.org/people/sstabellini/linux-pvhvm branches
 +#Patch20010: xen.pvhvm.fixes.patch
 +
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1364,13 -1356,14 +1372,21 @@@ ApplyPatch fs-call-security_d_instantia
  # rhbz#672778
  ApplyPatch ath5k-fix-fast-channel-change.patch
  
+ ApplyPatch bridge-fix-mglist-corruption-that-leads-to-memory-corruption.patch
+ 
+ # rhbz#676860
+ ApplyPatch usb-sierra-add-airprime-direct-ip.patch
+ 
+ # rhbz#672265
+ ApplyPatch revert-block-check-bdev-readonly.patch
+ 
 +# Xen patches
 +#ApplyPatch xen.next-2.6.38.patch
 +#ApplyPatch xen.upstream.core.patch
 +#ApplyPatch xen.pcifront.fixes.patch
 +ApplyPatch xen.pcifront.next-2.6.38.patch
 +#ApplyPatch xen.pvhvm.fixes.patch
 +
  # END OF PATCH APPLICATIONS
  
  %endif
@@@ -1973,21 -1966,22 +1989,27 @@@ f
  # plz don't put in a version string unless you're going to tag
  # and build.
  
- #  ___________________________________________________________
- # / This branch is for Fedora 15. You probably want to commit \
- # \ to the F-14 branch instead, or in addition to this one.   /
- #  -----------------------------------------------------------
- #         \   ^__^
- #          \  (@@)\_______
- #             (__)\       )\/\
- #                 ||----w |
- #                 ||     ||
  %changelog
+ * Wed Feb 16 2011 Chuck Ebbert <cebbert at redhat.com>
+ - Add support for Airprime/Sierra USB IP modem (#676860)
+ - Make virtio_console built-in on x86_64 (#677713)
+ - Revert check for read-only block device added in .38 (#672265)
+ 
+ * Tue Feb 15 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc5.git0.1
+ - Linux 2.6.38-rc5 (81 minutes later...)
+ 
+ * Sun Feb 13 2011 Chuck Ebbert <cebbert at redhat.com>  2.6.38-0.rc4.git7.1
+ - Linux 2.6.38-rc4-git7
+ 
+ * Sat Feb 12 2011 Chuck Ebbert <cebbert at redhat.com>  2.6.38-0.rc4.git6.1
+ - Linux 2.6.38-rc4-git6
+ - Fix memory corruption caused by bug in bridge code.
+ 
 +* Fri Feb 11 2011 Michael Young <m.a.young at durham.ac.uk>
 +- Try Konrad's devel/next-2.6.38 instead of Jeremy's xen/next-2.6.38
 +  which didn't boot last time
 +- Set options added by the switch XEN_DEBUG=n and XEN_GRANT_DEV_ALLOC=m
 +
  * Thu Feb 10 2011 Chuck Ebbert <cebbert at redhat.com>  2.6.38-0.rc4.git3.1
  - Linux 2.6.38-rc4-git3