[kernel] r18419 - dists/trunk/linux-2.6/debian/patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Sat Dec 24 11:02:52 2011
New Revision: 18419

Log:
Drop one hunk of an rt patch applied separately in 3.2-rc7

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/rt/scsi-fcoe-rt-aware.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/all/rt/scsi-fcoe-rt-aware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/rt/scsi-fcoe-rt-aware.patch	Sat Dec 24 10:57:51 2011	(r18418)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt/scsi-fcoe-rt-aware.patch	Sat Dec 24 11:02:52 2011	(r18419)
@@ -3,6 +3,7 @@
 Date: Sat, 12 Nov 2011 14:00:48 +0100
 
 Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
+[bwh: Drop hunk applied in commit 7e1e7ead88dff75b11b86ee0d5232c4591be1326]
 ---
  drivers/scsi/fcoe/fcoe.c      |   17 +++++++++--------
  drivers/scsi/fcoe/fcoe_ctlr.c |    4 ++--
@@ -46,14 +47,6 @@
  
  	return rc;
  }
-@@ -1624,6 +1624,7 @@ static inline int fcoe_filter_frames(str
- 	stats->InvalidCRCCount++;
- 	if (stats->InvalidCRCCount < 5)
- 		printk(KERN_WARNING "fcoe: dropping frame with CRC error\n");
-+	put_cpu();
- 	return -EINVAL;
- }
- 
 @@ -1668,7 +1669,7 @@ static void fcoe_recv_frame(struct sk_bu
  	 */
  	hp = (struct fcoe_hdr *) skb_network_header(skb);