[kernel] Linux 3.1-git7 (upstream 31555213f)

[Josh Boyer]

commit ea8a97de392f5812bf340e217ae7907762c94917
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon Nov 7 11:25:51 2011 -0500

    Linux 3.1-git7 (upstream 31555213f)

 TODO                                     |    5 --
 config-arm-generic                       |    2 +
 config-generic                           |    2 +
 config-powerpc64                         |    3 +
 config-x86_64-generic                    |    2 +-
 hvcs_pi_buf_alloc.patch                  |   43 -----------------
 kernel.spec                              |   15 ++----
 powerpc-Fix-deadlock-in-icswx-code.patch |   74 ------------------------------
 sources                                  |    2 +-
 9 files changed, 14 insertions(+), 134 deletions(-)
---
diff --git a/TODO b/TODO
index 6f14c66..a8b1a5d 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,9 @@
 **** Queued for 3.2 ***********************************************************************************
 
-* hvcs_pi_buf_alloc.patch
 * acpi-ensure-thermal-limits-match-cpu-freq.patch
 * revert-efi-rtclock.patch
 * block-stray-block-put-after-teardown.patch
 * efi-dont-map-boot-services-on-32bit.patch
-* powerpc-Fix-deadlock-in-icswx-code.patch
 * usb-add-quirk-for-logitech-webcams.patch (reworked, sent upstream)
 * epoll-limit-paths.patch (in linux-next via -mm tree)
 
@@ -101,6 +99,3 @@
 ***********************************************************************************
 
 Spec file/config todos/cleanups
-
-* Remove all of the RHEL stuff.  It isn't maintained in fedora at all and is
-just cruft
diff --git a/config-arm-generic b/config-arm-generic
index 332ada6..1406e40 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -176,3 +176,5 @@ CONFIG_FTGMAC100=m
 # CONFIG_ATM_HE is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PL330_DMA is not set
+# CONFIG_VIDEO_S5K6AA is not set
diff --git a/config-generic b/config-generic
index 9ae4301..683bd1f 100644
--- a/config-generic
+++ b/config-generic
@@ -3698,6 +3698,7 @@ CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_VXFS_FS=m
 # CONFIG_HPFS_FS is not set
@@ -4433,6 +4434,7 @@ CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
 
 CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
 # CONFIG_WLAGS49_H2 is not set
diff --git a/config-powerpc64 b/config-powerpc64
index 08994de..42b5016 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -8,6 +8,8 @@ CONFIG_PPC_PMAC64=y
 CONFIG_PPC_ISERIES=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
+CONFIG_PPC_POWERNV=y
+CONFIG_PPC_POWERNV_RTAS=y
 # CONFIG_PPC_PASEMI is not set
 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
 # CONFIG_PPC_PS3 is not set
@@ -41,6 +43,7 @@ CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVC_ISERIES=y
+CONFIG_HVC_OPAL=y
 
 # iSeries device drivers
 #
diff --git a/config-x86_64-generic b/config-x86_64-generic
index be41d73..10ce251 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -83,7 +83,7 @@ CONFIG_SGI_GRU=m
 
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
-CONFIG_XEN_MAX_DOMAIN_MEMORY=32
+CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 # CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/kernel.spec b/kernel.spec
index 6c240e4..1feb2f8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -691,10 +691,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
 Patch13002: revert-efi-rtclock.patch
 Patch13003: efi-dont-map-boot-services-on-32bit.patch
 
-Patch13009: hvcs_pi_buf_alloc.patch
-
-Patch13013: powerpc-Fix-deadlock-in-icswx-code.patch
-
 Patch20000: utrace.patch
 
 # Flattened devicetree support
@@ -1321,11 +1317,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 ApplyPatch revert-efi-rtclock.patch
 ApplyPatch efi-dont-map-boot-services-on-32bit.patch
 
-
-ApplyPatch hvcs_pi_buf_alloc.patch
-
-ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
-
 # utrace.
 ApplyPatch utrace.patch
 
@@ -2035,6 +2026,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Nov 07 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.1-git7
+- Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789)
+
 * Fri Nov 04 2011 Josh Boyer <jwboyer at redhat.com>
 - Linux 3.1-git6
 
diff --git a/sources b/sources
index a719eb1..770b550 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
-bd969a127cd8deb8eb4b94b9f5141c75  patch-3.1-git6.bz2
+09e1b3dc6b0902e6dbfbf781322f294f  patch-3.1-git7.bz2