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

[Steve Dickson]

commit 17fde2a7102dc86529bab3975a859d6e7e02e7f8
Merge: e4d5325 2380b04
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Aug 31 20:30:47 2010 -0400

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

 kernel.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index 1c4a113,846ef66..e968ebf
--- a/kernel.spec
+++ b/kernel.spec
@@@ -708,12 -710,13 +708,16 @@@ Patch12050: direct-io-move-aio_complete
  Patch12060: ext4-move-aio-completion-after-unwritten-extent-conversion.patch
  Patch12070: xfs-move-aio-completion-after-unwritten-extent-conversion.patch
  
 -Patch12080: mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
 -Patch12081: mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
 +Patch12080: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 +
 +Patch13000: pnfs-all-2.6.35-2010-08-19.patch
 +Patch13001: linux-2.6-pnfs-compile.patch
 +Patch13002: linux-2.6.35-inline.patch
  
+ Patch13000: pnfs-all-2.6.35-2010-08-19.patch
+ Patch13001: linux-2.6-pnfs-compile.patch
+ Patch13002: linux-2.6.35-inline.patch
+ 
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1311,13 -1312,14 +1315,17 @@@ ApplyPatch direct-io-move-aio_complete-
  ApplyPatch ext4-move-aio-completion-after-unwritten-extent-conversion.patch
  ApplyPatch xfs-move-aio-completion-after-unwritten-extent-conversion.patch
  
 -# fix fallout from stack guard page patches
 -ApplyPatch mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
 -ApplyPatch mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
 +# bz 610941
 +ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 +
 +ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
 +ApplyPatch linux-2.6-pnfs-compile.patch
 +ApplyPatch linux-2.6.35-inline.patch
  
+ ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
+ ApplyPatch linux-2.6-pnfs-compile.patch
+ ApplyPatch linux-2.6.35-inline.patch
+ 
  # END OF PATCH APPLICATIONS
  
  %endif
@@@ -1904,26 -1906,6 +1912,27 @@@ f
  # and build.
  
  %changelog
 +* Tue Aug 31 2010 Kyle McMartin <kyle at redhat.com> 2.6.35.4-14
 +- efifb-add-more-models.patch: Add patch from Luke Macken to
 +  support more Mac models (rhbz#528232)
 +
 +* Tue Aug 31 2010 Dave Jones <davej at redhat.com> 2.6.35.4-13
 +- Fix incorrect DMA size freeing error in via-velocity.
 +
 +* Fri Aug 27 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.35.4-12
 +- Linux 2.6.35.4
 +- kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch (#610941)
 +
 +* Wed Aug 25 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.35.4-11.rc1
 +- Linux 2.6.35.4-rc1
 +- Fix up linux-2.6-i386-nx-emulation.patch for 2.6.35.4
 +
 +* Sat Aug 21 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.35.3-10
 +- Linux 2.6.35.3
 +- Drop merged patches:
 +   mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
 +   mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
++
  * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
  - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19