[kernel/f12/user/myoung/xendom0: 3/4] Merge branch 'f12/master' into f12/user/myoung/xendom0

[myoung]

commit 674c686daedf0934080c67664d9411082da3525a
Merge: a2e7555 f69fa2a
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Sat Oct 23 13:41:44 2010 +0100

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

 drm-i915-sanity-check-pread-pwrite.patch |   90 ++++++++++++++++++++++++++++++
 kernel.spec                              |   48 +++++++++++-----
 sources                                  |    3 +-
 3 files changed, 124 insertions(+), 17 deletions(-)
---
diff --cc kernel.spec
index 4474ffa,9bbccfc..da552e6
--- a/kernel.spec
+++ b/kernel.spec
@@@ -1553,15 -1553,18 +1557,15 @@@ ApplyPatch kvm-mmu-fix-conflict-access-
  ApplyPatch net-do-not-check-capable-if-kernel.patch
  
  # Mitigate DOS with large argument lists
- ApplyPatch execve-improve-interactivity-with-large-arguments.patch
- ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch
- ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch
+ #ApplyPatch execve-improve-interactivity-with-large-arguments.patch
+ #ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch
+ #ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch
  
 -# Fix typo in Xen patch from 2.6.22 that causes hang on boot.
 -#ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
 -
  # rhbz#629158
- ApplyPatch r8169-fix-dma-allocations.patch
+ #ApplyPatch r8169-fix-dma-allocations.patch
  
  # rhbz#447489
- ApplyPatch skge-quirk-to-4gb-dma.patch
+ #ApplyPatch skge-quirk-to-4gb-dma.patch
  
  # rhbz#596475
  ApplyPatch add-support-for-ricoh-e822-sdhci.patch
@@@ -2222,9 -2221,18 +2226,21 @@@ f
  %kernel_variant_files -k vmlinux %{with_kdump} kdump
  
  %changelog
+ * Fri Oct 22 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.25-171.rc1
+ - Linux 2.6.32.25-rc1
+ - Comment out patches merged upstream:
+    execve-improve-interactivity-with-large-arguments.patch
+    execve-make-responsive-to-sigkill-with-large-arguments.patch
+    setup_arg_pages-diagnose-excessive-argument-size.patch
+    xen-fix-typo-in-xen-irq-fix.patch
+    r8169-fix-dma-allocations.patch
+    skge-quirk-to-4gb-dma.patch
+ - drm-i915-sanity-check-pread-pwrite.patch: backport fix for
+    CVE-2010-2962
+ 
 +* Thu Oct 21 2010 Michael Young <m.a.young at durham.ac.uk>
 +- update pvops including event channels fix
 +
  * Thu Oct 14 2010 Kyle McMartin <kyle at redhat.com>
  - rhbz447489: skge-quirk-to-4gb-dma.patch
  - rhbz629158: r8169-fix-dma-allocations.patch