beaglebone 3.2: update to 3.2.42

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
beagleboard · Mar 28, 2013 · 257b82b · 257b82b
1 parent 73ae303
commit 257b82b
Show file tree

Hide file tree

Showing 3,431 changed files with 51,510 additions and 11,920 deletions.
diff --git a/configs/beaglebone b/configs/beaglebone
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.28 Kernel Configuration
+# Linux/arm 3.2.42 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -438,7 +438,7 @@ CONFIG_VIRT_TO_BUS=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_SECCOMP is not set
@@ -2768,7 +2768,6 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=y
 CONFIG_USB_LIBUSUAL=y
 
 #

diff --git a/patch.sh b/patch.sh
@@ -20,7 +20,7 @@ EXTERNAL_TREE="git://arago-project.org/git/projects/linux-am33x.git"
 EXTERNAL_BRANCH="v3.2-staging"
 EXTERNAL_SHA="720e07b4c1f687b61b147b31c698cb6816d72f01"
 
-PATCHSET="usb psp 3.2.1 3.2.2 3.2.3 3.2.4 3.2.5 3.2.6 3.2.7 3.2.8 3.2.9 3.2.10 3.2.11 3.2.12 3.2.13 3.2.14 3.2.15 3.2.16 3.2.17 3.2.18 3.2.19 3.2.20 3.2.21 3.2.22 3.2.23 3.2.24 3.2.25 3.2.26 3.2.27 3.2.28 3.2.29 3.2.30 3.2.31 3.2.32 3.2.33 3.2.34 3.2.35 3.2.36 3.2.37 led libertas pwm mfd beaglebone"
+PATCHSET="usb psp 3.2.1 3.2.2 3.2.3 3.2.4 3.2.5 3.2.6 3.2.7 3.2.8 3.2.9 3.2.10 3.2.11 3.2.12 3.2.13 3.2.14 3.2.15 3.2.16 3.2.17 3.2.18 3.2.19 3.2.20 3.2.21 3.2.22 3.2.23 3.2.24 3.2.25 3.2.26 3.2.27 3.2.28 3.2.29 3.2.30 3.2.31 3.2.32 3.2.33 3.2.34 3.2.35 3.2.36 3.2.37 3.2.38 3.2.39 3.2.40 3.2.41 3.2.42 led libertas pwm mfd beaglebone"
 
 git_kernel_stable () {
 	git pull git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git master --tags || true
@@ -77,7 +77,7 @@ for patchset in ${PATCHSET} ; do
 	mkdir -p ${EXPORTPATH}/$patchset
 	for patch in $(ls -1 ${PATCHPATH}/$patchset/*.patch | sort -n) ; do
 		$ECHO -n "$patch: "
-		git am -3 -q $patch && echo applied || exit 1
+		git am -q $patch && echo applied || exit 1
 	done
 
 	NEWCOMMIT="$(git log --oneline --no-abbrev -1 | awk '{print $1}')"

diff --git a/patches/3.2.1/0001-MAINTAINERS-stable-Update-address.patch b/patches/3.2.1/0001-MAINTAINERS-stable-Update-address.patch
@@ -1,4 +1,4 @@
-From fd72f778957abfff846d5c4f15784cc5fd56b206 Mon Sep 17 00:00:00 2001
+From ca52b60ae460f7b8c99ae46d9241218323286a7e Mon Sep 17 00:00:00 2001
 From: Joe Perches <joe@perches.com>
 Date: Fri, 9 Dec 2011 13:54:34 -0800
 Subject: [PATCH 01/49] MAINTAINERS: stable: Update address
@@ -10,8 +10,8 @@ The old address hasn't worked since the great intrusion of August 2011.
 Signed-off-by: Joe Perches <joe@perches.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- MAINTAINERS |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ MAINTAINERS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 62f1cd3..f986e7d 100644
@@ -27,5 +27,5 @@ index 62f1cd3..f986e7d 100644
 
  STAGING SUBSYSTEM
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0002-Documentation-Update-stable-address.patch b/patches/3.2.1/0002-Documentation-Update-stable-address.patch
@@ -1,4 +1,4 @@
-From c841b532de02397154c70396e54aa50d258b9a26 Mon Sep 17 00:00:00 2001
+From 97cd718da2dc341868af8d0e1392d3b01993566c Mon Sep 17 00:00:00 2001
 From: Joe Perches <joe@perches.com>
 Date: Fri, 9 Dec 2011 14:12:00 -0800
 Subject: [PATCH 02/49] Documentation: Update stable address
@@ -13,8 +13,8 @@ and should be updated as well.
 Signed-off-by: Joe Perches <joe@perches.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- Documentation/HOWTO                         |    4 ++--
- Documentation/development-process/5.Posting |    8 ++++----
+ Documentation/HOWTO                         | 4 ++--
+ Documentation/development-process/5.Posting | 8 ++++----
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Documentation/HOWTO b/Documentation/HOWTO
@@ -52,5 +52,5 @@ index 903a254..8a48c9b 100644
  When selecting recipients for a patch, it is good to have an idea of who
  you think will eventually accept the patch and get it merged.  While it
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0003-firmware-Fix-an-oops-on-reading-fw_priv-fw-in-sysfs-.patch b/patches/3.2.1/0003-firmware-Fix-an-oops-on-reading-fw_priv-fw-in-sysfs-.patch
@@ -1,4 +1,4 @@
-From cbb2dbd11cda7bc5c65bcdaa157b30759d2aecea Mon Sep 17 00:00:00 2001
+From 94856ed8c57b3ac31bf88bb02126839af325f2e5 Mon Sep 17 00:00:00 2001
 From: Neil Horman <nhorman@tuxdriver.com>
 Date: Mon, 2 Jan 2012 15:31:23 -0500
 Subject: [PATCH 03/49] firmware: Fix an oops on reading fw_priv->fw in sysfs
@@ -32,8 +32,8 @@ to cover all of the firware_loading_store function.
 Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/base/firmware_class.c |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
+ drivers/base/firmware_class.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
 index 06ed6b4..3719c94 100644
@@ -77,5 +77,5 @@ index 06ed6b4..3719c94 100644
  }
 
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0004-rt2800usb-Move-ID-out-of-unknown.patch b/patches/3.2.1/0004-rt2800usb-Move-ID-out-of-unknown.patch
@@ -1,4 +1,4 @@
-From ce8b643566fe860cbfb13f7e33689ce8b634600f Mon Sep 17 00:00:00 2001
+From a642db74515df807ca57229c47e6a2fd2b5143d0 Mon Sep 17 00:00:00 2001
 From: Larry Finger <Larry.Finger@lwfinger.net>
 Date: Tue, 27 Dec 2011 12:22:51 -0600
 Subject: [PATCH 04/49] rt2800usb: Move ID out of unknown
@@ -15,8 +15,8 @@ Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
 Signed-off-by: John W. Linville <linville@tuxdriver.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/net/wireless/rt2x00/rt2800usb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ drivers/net/wireless/rt2x00/rt2800usb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
 index 3778763..3265b34 100644
@@ -39,5 +39,5 @@ index 3778763..3265b34 100644
  	/* Logitec */
  	{ USB_DEVICE(0x0789, 0x0168) },
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0005-offb-Fix-setting-of-the-pseudo-palette-for-8bpp.patch b/patches/3.2.1/0005-offb-Fix-setting-of-the-pseudo-palette-for-8bpp.patch
@@ -1,4 +1,4 @@
-From 6efd3096f9d9fa640114857019e2889820f7b3a4 Mon Sep 17 00:00:00 2001
+From 2fa5ec7c95bca96b9fcf1e179a1b38f174a232f3 Mon Sep 17 00:00:00 2001
 From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Date: Wed, 28 Dec 2011 00:10:16 +0000
 Subject: [PATCH 05/49] offb: Fix setting of the pseudo-palette for >8bpp
@@ -20,8 +20,8 @@ qemu does it).
 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/video/offb.c |   50 +++++++++++++++++++++++---------------------------
- 1 files changed, 23 insertions(+), 27 deletions(-)
+ drivers/video/offb.c | 50 +++++++++++++++++++++++---------------------------
+ 1 file changed, 23 insertions(+), 27 deletions(-)
 
 diff --git a/drivers/video/offb.c b/drivers/video/offb.c
 index cb163a5..24e1fc6 100644
@@ -88,5 +88,5 @@ index cb163a5..24e1fc6 100644
  	green >>= 8;
  	blue >>= 8;
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0006-offb-Fix-bug-in-calculating-requested-vram-size.patch b/patches/3.2.1/0006-offb-Fix-bug-in-calculating-requested-vram-size.patch
@@ -1,4 +1,4 @@
-From 00e291ae2a784893c0f85c333d216c0dff45af94 Mon Sep 17 00:00:00 2001
+From 4226d0adb352bc516022a9c9fe31884a2c400240 Mon Sep 17 00:00:00 2001
 From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Date: Tue, 3 Jan 2012 12:09:15 +1100
 Subject: [PATCH 06/49] offb: Fix bug in calculating requested vram size
@@ -11,8 +11,8 @@ fail if the card has a too small BAR (observed with qemu & kvm).
 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/video/offb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ drivers/video/offb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/video/offb.c b/drivers/video/offb.c
 index 24e1fc6..3251a02 100644
@@ -28,5 +28,5 @@ index 24e1fc6..3251a02 100644
  	unsigned long res_start = address;
  	struct fb_fix_screeninfo *fix;
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0007-libertas-clean-up-scan-thread-handling.patch b/patches/3.2.1/0007-libertas-clean-up-scan-thread-handling.patch
@@ -1,4 +1,4 @@
-From 46d5d6045bad2e97093afd4c8378c67b91d97446 Mon Sep 17 00:00:00 2001
+From 513fa9b5375757292443de2ad35d46dade470651 Mon Sep 17 00:00:00 2001
 From: Andres Salomon <dilinger@queued.net>
 Date: Mon, 19 Dec 2011 12:22:58 -0800
 Subject: [PATCH 07/49] libertas: clean up scan thread handling
@@ -45,8 +45,8 @@ Signed-off-by: Andres Salomon <dilinger@queued.net>
 Signed-off-by: John W. Linville <linville@tuxdriver.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/net/wireless/libertas/cfg.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
+ drivers/net/wireless/libertas/cfg.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
 index a7f1ab2..db64ef1 100644
@@ -82,5 +82,5 @@ index a7f1ab2..db64ef1 100644
  }
 
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0008-bcma-support-for-suspend-and-resume.patch b/patches/3.2.1/0008-bcma-support-for-suspend-and-resume.patch
@@ -1,4 +1,4 @@
-From 281928b6b2fafa36b84474c1d95fd719ea552c85 Mon Sep 17 00:00:00 2001
+From 993c58ea6257e19c6e36bd9780baa8646d08ee23 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
 Date: Fri, 9 Dec 2011 22:16:07 +0100
 Subject: [PATCH 08/49] bcma: support for suspend and resume
@@ -14,10 +14,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Signed-off-by: John W. Linville <linville@tuxdriver.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/bcma/bcma_private.h |    3 +++
- drivers/bcma/host_pci.c     |   37 +++++++++++++++++++++++++++++++++++++
- drivers/bcma/main.c         |   16 ++++++++++++++++
- 3 files changed, 56 insertions(+), 0 deletions(-)
+ drivers/bcma/bcma_private.h |  3 +++
+ drivers/bcma/host_pci.c     | 37 +++++++++++++++++++++++++++++++++++++
+ drivers/bcma/main.c         | 16 ++++++++++++++++
+ 3 files changed, 56 insertions(+)
 
 diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
 index 30a3085..fda56bd 100644
@@ -116,5 +116,5 @@ index 70c84b9..10f92b3 100644
  {
  	drv->drv.name = drv->name;
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0009-wl12xx-Validate-FEM-index-from-ini-file-and-FW.patch b/patches/3.2.1/0009-wl12xx-Validate-FEM-index-from-ini-file-and-FW.patch
@@ -1,4 +1,4 @@
-From 279d8e2ed2492fe44cdd2dbbae6ab7a34950a4df Mon Sep 17 00:00:00 2001
+From a516ec1dd5d18a06b87d67e969f669ac0e6845a3 Mon Sep 17 00:00:00 2001
 From: Pontus Fuchs <pontus.fuchs@gmail.com>
 Date: Tue, 18 Oct 2011 09:23:41 +0200
 Subject: [PATCH 09/49] wl12xx: Validate FEM index from ini file and FW
@@ -13,8 +13,8 @@ Reviewed-by: Luciano Coelho <coelho@ti.com>
 Signed-off-by: Luciano Coelho <coelho@ti.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/net/wireless/wl12xx/cmd.c |   22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ drivers/net/wireless/wl12xx/cmd.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
 
 diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
 index a52299e..54a0d66 100644
@@ -71,5 +71,5 @@ index a52299e..54a0d66 100644
  		     answer ? "auto" : "manual", gp->tx_bip_fem_manufacturer);
 
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0010-wl12xx-Check-buffer-bound-when-processing-nvs-data.patch b/patches/3.2.1/0010-wl12xx-Check-buffer-bound-when-processing-nvs-data.patch
@@ -1,4 +1,4 @@
-From 9a53ea28761d27ff0e4e5e5b42637b0b05f106bf Mon Sep 17 00:00:00 2001
+From 5d74dca629abf08584ff9a962dd3e9d4094a8bbb Mon Sep 17 00:00:00 2001
 From: Pontus Fuchs <pontus.fuchs@gmail.com>
 Date: Tue, 18 Oct 2011 09:23:42 +0200
 Subject: [PATCH 10/49] wl12xx: Check buffer bound when processing nvs data
@@ -14,8 +14,8 @@ Reviewed-by: Luciano Coelho <coelho@ti.com>
 Signed-off-by: Luciano Coelho <coelho@ti.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/net/wireless/wl12xx/boot.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ drivers/net/wireless/wl12xx/boot.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
 
 diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
 index 6813379..a7b327d 100644
@@ -64,5 +64,5 @@ index 6813379..a7b327d 100644
 
  static void wl1271_boot_enable_interrupts(struct wl1271 *wl)
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0011-wl12xx-Restore-testmode-ABI.patch b/patches/3.2.1/0011-wl12xx-Restore-testmode-ABI.patch
@@ -1,4 +1,4 @@
-From 41389a07b0a018dddbc9807e3c36c6b0cf1c85df Mon Sep 17 00:00:00 2001
+From 1cb468d84a76661c1aaa9939230f1ce5b2cc5b6b Mon Sep 17 00:00:00 2001
 From: Pontus Fuchs <pontus.fuchs@gmail.com>
 Date: Thu, 1 Dec 2011 12:13:44 +0100
 Subject: [PATCH 11/49] wl12xx: Restore testmode ABI
@@ -12,8 +12,8 @@ Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
 Signed-off-by: Luciano Coelho <coelho@ti.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/net/wireless/wl12xx/testmode.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ drivers/net/wireless/wl12xx/testmode.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/wireless/wl12xx/testmode.c b/drivers/net/wireless/wl12xx/testmode.c
 index 4ae8eff..abfb120 100644
@@ -28,5 +28,5 @@ index 4ae8eff..abfb120 100644
  	WL1271_TM_CMD_RECOVER,
 
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0012-powerpc-time-Handle-wrapping-of-decrementer.patch b/patches/3.2.1/0012-powerpc-time-Handle-wrapping-of-decrementer.patch
@@ -1,4 +1,4 @@
-From f25cb83e2b382d9b864dd01234c70f581a409534 Mon Sep 17 00:00:00 2001
+From 2bc06804237f79fa59fe7444f91c0252a4d1ef6d Mon Sep 17 00:00:00 2001
 From: Anton Blanchard <anton@samba.org>
 Date: Wed, 23 Nov 2011 20:07:17 +0000
 Subject: [PATCH 12/49] powerpc/time: Handle wrapping of decrementer
@@ -24,9 +24,9 @@ Signed-off-by: Anton Blanchard <anton@samba.org>
 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- arch/powerpc/include/asm/time.h |    2 ++
- arch/powerpc/kernel/irq.c       |   15 ++++++---------
- arch/powerpc/kernel/time.c      |    9 +++++++++
+ arch/powerpc/include/asm/time.h |  2 ++
+ arch/powerpc/kernel/irq.c       | 15 ++++++---------
+ arch/powerpc/kernel/time.c      |  9 +++++++++
  3 files changed, 17 insertions(+), 9 deletions(-)
 
 diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h
@@ -89,5 +89,5 @@ index 522bb1d..5db163c 100644
  				      struct clock_event_device *dev)
  {
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0013-powerpc-Fix-unpaired-probe_hcall_entry-and-probe_hca.patch b/patches/3.2.1/0013-powerpc-Fix-unpaired-probe_hcall_entry-and-probe_hca.patch
@@ -1,4 +1,4 @@
-From 8ed7801e84b78441de0cb800ced9ae9f759b0efd Mon Sep 17 00:00:00 2001
+From 877a79c4f92fe10de951e0ad9dc48e90ff5695c1 Mon Sep 17 00:00:00 2001
 From: Li Zhong <zhong@linux.vnet.ibm.com>
 Date: Sun, 18 Dec 2011 16:03:04 +0000
 Subject: [PATCH 13/49] powerpc: Fix unpaired probe_hcall_entry and
@@ -34,8 +34,8 @@ Tested-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- arch/powerpc/platforms/pseries/hvCall_inst.c |    4 +---
- arch/powerpc/platforms/pseries/lpar.c        |    2 ++
+ arch/powerpc/platforms/pseries/hvCall_inst.c | 4 +---
+ arch/powerpc/platforms/pseries/lpar.c        | 2 ++
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -81,5 +81,5 @@ index 27a4950..dc36ea6 100644
 
  out:
 -- 
-1.7.7.6
+1.8.1.4
 
diff --git a/patches/3.2.1/0014-IB-qib-Fix-a-possible-data-corruption-when-receiving.patch b/patches/3.2.1/0014-IB-qib-Fix-a-possible-data-corruption-when-receiving.patch
@@ -1,4 +1,4 @@
-From 809ed3ebdf0c15f84bf8729a3b27f68d507b6f53 Mon Sep 17 00:00:00 2001
+From 9aebe78fe4dca135b4ef82f4f1122b15ef1a12b9 Mon Sep 17 00:00:00 2001
 From: Ram Vepa <ram.vepa@qlogic.com>
 Date: Fri, 23 Dec 2011 08:01:43 -0500
 Subject: [PATCH 14/49] IB/qib: Fix a possible data corruption when receiving
@@ -15,9 +15,9 @@ Signed-off-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com>
 Signed-off-by: Roland Dreier <roland@purestorage.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
- drivers/infiniband/hw/qib/qib_iba6120.c |    4 +++-
- drivers/infiniband/hw/qib/qib_iba7220.c |    4 +++-
- drivers/infiniband/hw/qib/qib_iba7322.c |    6 ++++--
+ drivers/infiniband/hw/qib/qib_iba6120.c | 4 +++-
+ drivers/infiniband/hw/qib/qib_iba7220.c | 4 +++-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 6 ++++--
  3 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -74,5 +74,5 @@ index 1d58959..5a070e8 100644
 
  static u32 qib_7322_hdrqempty(struct qib_ctxtdata *rcd)
 -- 
-1.7.7.6
+1.8.1.4