From c97a188a25292c8ea2505c9d881bc198e6c20552 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 3 Jun 2014 20:39:28 -0300 Subject: linux-libre-3.14.5-1: updating version --- ...0004-fs-Don-t-return-0-from-get_anon_bdev.patch | 44 ---------------------- ...h-correct-mac_len-in-skb_network_protocol.patch | 13 ------- libre/linux-libre/PKGBUILD | 23 +++-------- 3 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch delete mode 100644 libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch (limited to 'libre/linux-libre') diff --git a/libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch b/libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch deleted file mode 100644 index 5e4a27f06..000000000 --- a/libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Thu, 3 Apr 2014 21:55:37 +0200 -Subject: [PATCH 04/10] fs: Don't return 0 from get_anon_bdev -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 9e30cc9595303b27b48 removed an internal mount. This -has the side-effect that rootfs now has FSID 0. Many -userspace utilities assume that st_dev in struct stat -is never 0, so this change breaks a number of tools in -early userspace. - -Since we don't know how many userspace programs are affected, -make sure that FSID is at least 1. - -References: http://article.gmane.org/gmane.linux.kernel/1666905 -References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557 -Cc: 3.14 -Signed-off-by: Thomas Bächler ---- - fs/super.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/fs/super.c b/fs/super.c -index 80d5cf2..7624267 100644 ---- a/fs/super.c -+++ b/fs/super.c -@@ -802,7 +802,10 @@ void emergency_remount(void) - - static DEFINE_IDA(unnamed_dev_ida); - static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */ --static int unnamed_dev_start = 0; /* don't bother trying below it */ -+/* Many userspace utilities consider an FSID of 0 invalid. -+ * Always return at least 1 from get_anon_bdev. -+ */ -+static int unnamed_dev_start = 1; - - int get_anon_bdev(dev_t *p) - { --- -1.9.2 - diff --git a/libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch deleted file mode 100644 index 2840f190c..000000000 --- a/libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/net/core/dev.c b/net/core/dev.c -index 45fa2f1..6088927 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help); - __be16 skb_network_protocol(struct sk_buff *skb, int *depth) - { - __be16 type = skb->protocol; -- int vlan_depth = ETH_HLEN; -+ int vlan_depth = skb->mac_len; - - /* Tunnel gso handlers can set protocol to ethernet. */ - if (type == htons(ETH_P_TEB)) { diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d6b5755dc..9f0dda4ef 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $ +# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $ # Maintainer (Arch): Tobias Powalowski # Maintainer (Arch): Thomas Baechler # Maintainer: André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,17 +32,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0004-fs-Don-t-return-0-from-get_anon_bdev.patch' '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' '0011-kernfs-fix-removed-error-check.patch' '0012-fix-saa7134.patch' - '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch' '0015-fix-xsdt-validation.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815' + '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' '71891ae6903598f4686e86fdb0d371ff9e179e8dac1d2cf60ca16c5190916745' 'fca0060bde385e2c292489087af0aa5f48da594221a6d162fc6f8ba2159571e8' 'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176' @@ -53,15 +51,13 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1' '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - 'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be' '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' - '43d975e9c9c68de131005a87c3c755fadef1eaed6c551bcafd08f2746f9d71fd') + '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -96,10 +92,6 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Fix various bugs caused by rootfs having FSID 0 - # See http://www.spinics.net/lists/kernel/msg1716924.html - patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch" - # Disable usb autosuspend for intel btusb # See http://www.spinics.net/lists/kernel/msg1716461.html # Until a solution is found, make sure the driver leaves autosuspend alone @@ -122,11 +114,6 @@ prepare() { # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix tun/openvpn performance - # https://bugs.archlinux.org/task/40089 - # https://bugzilla.kernel.org/show_bug.cgi?id=74051 - patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch" - # fix xsdt validation bug # https://bugs.archlinux.org/task/39811 # https://bugzilla.kernel.org/show_bug.cgi?id=73911 -- cgit v1.2.3-54-g00ecf