diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-10-05 14:41:44 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-10-05 14:41:44 -0300 |
| commit | f44e8c38bafbf77c995f2455f2e869ca235983e2 (patch) | |
| tree | 8bfa72f2fd539e18a4d71dbb87f88e73820c4f40 /libre/linux-libre | |
| parent | fc5a317fbe3753457b6c08b776ef8822022f576e (diff) | |
linux-libre-3.11.3-1: updating version
* remove obsolete skge patch
Diffstat (limited to 'libre/linux-libre')
| -rw-r--r-- | libre/linux-libre/3.11.1-fix-skge.patch | 34 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 15 |
2 files changed, 5 insertions, 44 deletions
diff --git a/libre/linux-libre/3.11.1-fix-skge.patch b/libre/linux-libre/3.11.1-fix-skge.patch deleted file mode 100644 index 26d90e080..000000000 --- a/libre/linux-libre/3.11.1-fix-skge.patch +++ /dev/null @@ -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); diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6f233515d..9852968ad 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195190 2013-09-27 06:12:11Z tpowa $ +# $Id: PKGBUILD 195840 2013-10-02 00:02:27Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,11 +30,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.11.1-fix-skge.patch' '3.11-haswell-intel_pstate.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' - '33426579c358003b46a3cc2171ae6505' + 'fbbc311a2ba15cfe2f533df71081d954' 'b7718a81faf845ab53234336122ad631' 'f7ee88ffc93b665345b6ee89ff192e1f' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,9 +42,8 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '4fcee2b4485492dcfdead632275198eb' '1040ae6c10d4a68f89899f94a2318a17' - '135ff203ec680a91e87eed4df72f453d') + 'e6db810c0d41180acca55f545b1681fb') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -70,9 +68,6 @@ prepare() { # (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 |