fixups and acks based on the review cycle starting for .32 and .33

diff --git a/review-2.6.32/mips-uasm-add-or-instruction.patch b/review-2.6.32/mips-uasm-add-or-instruction.patch
deleted file mode 100644 (file)
index 18db85d..0000000
--- a/review-2.6.32/mips-uasm-add-or-instruction.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ralf@linux-mips.org  Mon May 10 11:09:57 2010
-From: Ralf Baechle <ralf@linux-mips.org>
-Date: Fri, 23 Apr 2010 02:56:39 +0100
-Subject: MIPS: uasm: Add OR instruction.
-To: Greg KH <greg@kroah.com>, stable@kernel.org
-Cc: Ralf Baechle <ralf@linux-mips.org>, Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Message-ID: <1271987800-26851-2-git-send-email-ralf@linux-mips.org>
-
-(cherry picked from commit 9c6befe8c744fa2f03cab36dead503c77950c3b8)
-
-This is needed for the fix of the M3 workaround.
-
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
---- a/arch/mips/include/asm/uasm.h
-+++ b/arch/mips/include/asm/uasm.h
-@@ -84,6 +84,7 @@ Ip_u2s3u1(_lw);
- Ip_u1u2u3(_mfc0);
- Ip_u1u2u3(_mtc0);
- Ip_u2u1u3(_ori);
-+Ip_u3u1u2(_or);
- Ip_u2s3u1(_pref);
- Ip_0(_rfe);
- Ip_u2s3u1(_sc);
-diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
-index e3ca0f7..29bbd10 100644
---- a/arch/mips/mm/uasm.c
-+++ b/arch/mips/mm/uasm.c
-@@ -61,7 +61,7 @@ enum opcode {
-       insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl,
-       insn_dsrl32, insn_drotr, insn_dsubu, insn_eret, insn_j, insn_jal,
-       insn_jr, insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0,
--      insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd,
-+      insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd,
-       insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw,
-       insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori, insn_dins
- };
-@@ -116,6 +116,7 @@ static struct insn insn_table[] __cpuinitdata = {
-       { insn_lw,  M(lw_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
-       { insn_mfc0,  M(cop0_op, mfc_op, 0, 0, 0, 0),  RT | RD | SET},
-       { insn_mtc0,  M(cop0_op, mtc_op, 0, 0, 0, 0),  RT | RD | SET},
-+      { insn_or,  M(spec_op, 0, 0, 0, 0, or_op),  RS | RT | RD },
-       { insn_ori,  M(ori_op, 0, 0, 0, 0, 0),  RS | RT | UIMM },
-       { insn_pref,  M(pref_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
-       { insn_rfe,  M(cop0_op, cop_op, 0, 0, 0, rfe_op),  0 },
-@@ -370,6 +371,7 @@ I_u2s3u1(_lw)
- I_u1u2u3(_mfc0)
- I_u1u2u3(_mtc0)
- I_u2u1u3(_ori)
-+I_u3u1u2(_or)
- I_u2s3u1(_pref)
- I_0(_rfe)
- I_u2s3u1(_sc)
--- 
-1.6.6.1
-

diff --git a/review-2.6.32/series b/review-2.6.32/series
index d7928d3fcb43bca901dee34a6f215e5b83cb4f79..88789d57a1d975bf0c80d3b155e85ce9499befa8 100644 (file)
--- a/review-2.6.32/series
+++ b/review-2.6.32/series
@@ -95,4 +95,3 @@ scsi_debug-virtual_gb-ignores-sector_size.patch
 enable-retries-for-syncronize_cache-commands-to-fix-i-o-error.patch
 scsi-retry-commands-with-unit_attention-sense-codes-to-fix-ext3-ext4-i-o-error.patch
 mips-sibyte-apply-m3-workaround-only-on-affected-chip-types-and-versions.patch
-mips-uasm-add-or-instruction.patch

diff --git a/review-2.6.32/xfs-add-a-shrinker-to-background-inode-reclaim.patch b/review-2.6.32/xfs-add-a-shrinker-to-background-inode-reclaim.patch
index e2fd6735003927398497e4ff2a236ca4a68d84bd..012d1bbe1172a585e951f6db3db1d739c86649dd 100644 (file)
--- a/review-2.6.32/xfs-add-a-shrinker-to-background-inode-reclaim.patch
+++ b/review-2.6.32/xfs-add-a-shrinker-to-background-inode-reclaim.patch
@@ -21,6 +21,7 @@ traverse them.
 
 Signed-off-by: Dave Chinner <dchinner@redhat.com>
 Reviewed-by: Christoph Hellwig <hch@lst.de>
+Acked-by: Alex Elder <aelder@sgi.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 

diff --git a/review-2.6.33/drm-i915-add-initial-bits-for-vga-modesetting-bringup-on-sandybridge.patch b/review-2.6.33/drm-i915-add-initial-bits-for-vga-modesetting-bringup-on-sandybridge.patch
index e3e63a0fca49548da66510224241539211dc6d90..d7bfbe8df7da43b1d35cfeda693f8cd9732dc62d 100644 (file)
--- a/review-2.6.33/drm-i915-add-initial-bits-for-vga-modesetting-bringup-on-sandybridge.patch
+++ b/review-2.6.33/drm-i915-add-initial-bits-for-vga-modesetting-bringup-on-sandybridge.patch
@@ -595,11 +595,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  
  static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
---- a/include/drm/drm_pciids.h
-+++ b/include/drm/drm_pciids.h
-@@ -560,4 +560,5 @@
-       {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-       {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-       {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-+      {0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-       {0, 0, 0}

diff --git a/review-2.6.33/xfs-add-a-shrinker-to-background-inode-reclaim.patch b/review-2.6.33/xfs-add-a-shrinker-to-background-inode-reclaim.patch
index 2686f592b6dc935647d969b18921f4a786c15a8e..2cd42c92445449de4b4fde95d33191cf6ea0e8f7 100644 (file)
--- a/review-2.6.33/xfs-add-a-shrinker-to-background-inode-reclaim.patch
+++ b/review-2.6.33/xfs-add-a-shrinker-to-background-inode-reclaim.patch
@@ -21,6 +21,7 @@ traverse them.
 
 Signed-off-by: Dave Chinner <dchinner@redhat.com>
 Reviewed-by: Christoph Hellwig <hch@lst.de>
+Acked-by: Alex Elder <aelder@sgi.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>