[arch-commits] Commit in linux/trunk (3.11.1-fix-skge.patch PKGBUILD)

[Thomas Bächler]

    Date: Wednesday, October 2, 2013 @ 02:02:27
  Author: thomas
Revision: 195840

upgpkg: linux 3.11.3-1

upstream update, remove obsolete skge patch

Modified:
  linux/trunk/PKGBUILD
Deleted:
  linux/trunk/3.11.1-fix-skge.patch

-----------------------+
 3.11.1-fix-skge.patch |   34 ----------------------------------
 PKGBUILD              |    9 ++-------
 2 files changed, 2 insertions(+), 41 deletions(-)

Deleted: 3.11.1-fix-skge.patch
===================================================================
--- 3.11.1-fix-skge.patch	2013-10-01 20:38:57 UTC (rev 195839)
+++ 3.11.1-fix-skge.patch	2013-10-02 00:02:27 UTC (rev 195840)
@@ -1,34 +0,0 @@
---- a/drivers/net/ethernet/marvell/skge.c	2013-09-02 16:46:10.000000000 -0400
-+++ b/drivers/net/ethernet/marvell/skge.c	2013-09-22 11:14:10.232067541 -0400
-@@ -3086,23 +3086,27 @@
- 					       PCI_DMA_FROMDEVICE);
- 		skge_rx_reuse(e, skge->rx_buf_size);
- 	} else {
-+		struct skge_element ee;
- 		struct sk_buff *nskb;
- 
- 		nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size);
- 		if (!nskb)
- 			goto resubmit;
- 
-+		ee = *e;
-+
-+		skb = ee.skb;
-+		prefetch(skb->data);
-+
- 		if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
- 			dev_kfree_skb(nskb);
- 			goto resubmit;
- 		}
- 
- 		pci_unmap_single(skge->hw->pdev,
--				 dma_unmap_addr(e, mapaddr),
--				 dma_unmap_len(e, maplen),
-+				 dma_unmap_addr(&ee, mapaddr),
-+				 dma_unmap_len(&ee, maplen),
- 				 PCI_DMA_FROMDEVICE);
--		skb = e->skb;
--		prefetch(skb->data);
- 	}
- 
- 	skb_put(skb, len);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-01 20:38:57 UTC (rev 195839)
+++ PKGBUILD	2013-10-02 00:02:27 UTC (rev 195840)
@@ -5,7 +5,7 @@
 pkgbase=linux               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-3.11
-pkgver=3.11.2
+pkgver=3.11.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -20,16 +20,14 @@
         'linux.preset'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.11.1-fix-skge.patch'
         '3.11-haswell-intel_pstate.patch')
 md5sums=('fea363551ff45fbe4cb88497b863b261'
-         '5aa3286dcc7d70ceb50c3cbc64bc1cd8'
+         'b098457c2d9e9626faacfda931deefb6'
          '247d9bafa184e2d9a27c1a0485419fff'
          '5effb245b8ec78ad570b3e5962a1a7e0'
          'eb14dcfd80c00852ef81ded6e826826a'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '4fcee2b4485492dcfdead632275198eb'
          '1040ae6c10d4a68f89899f94a2318a17')
 
 _kernelname=${pkgbase#linux}
@@ -54,9 +52,6 @@
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # #36865 fix broken skge network module
-  patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch"
- 
   # add intel haswell support to intel_pstate
   # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
   # will be in 3.12