[arch-commits] Commit in linux/trunk (3 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Sun Jun 1 05:52:43 UTC 2014
Date: Sunday, June 1, 2014 @ 07:52:43
Author: tpowa
Revision: 213942
upgpkg: linux 3.14.5-1
bump to latest version
Modified:
linux/trunk/PKGBUILD
Deleted:
linux/trunk/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
linux/trunk/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
-------------------------------------------------------------------+
0004-fs-Don-t-return-0-from-get_anon_bdev.patch | 44 ----------
0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch | 13 --
PKGBUILD | 17 ---
3 files changed, 2 insertions(+), 72 deletions(-)
Deleted: 0004-fs-Don-t-return-0-from-get_anon_bdev.patch
===================================================================
--- 0004-fs-Don-t-return-0-from-get_anon_bdev.patch 2014-06-01 04:23:08 UTC (rev 213941)
+++ 0004-fs-Don-t-return-0-from-get_anon_bdev.patch 2014-06-01 05:52:43 UTC (rev 213942)
@@ -1,44 +0,0 @@
-From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
-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 <stable at vger.kernel.org>
-Signed-off-by: Thomas Bächler <thomas at archlinux.org>
----
- 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
-
Deleted: 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
===================================================================
--- 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch 2014-06-01 04:23:08 UTC (rev 213941)
+++ 0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch 2014-06-01 05:52:43 UTC (rev 213942)
@@ -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)) {
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-01 04:23:08 UTC (rev 213941)
+++ PKGBUILD 2014-06-01 05:52:43 UTC (rev 213942)
@@ -5,7 +5,7 @@
pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
_srcname=linux-3.14
-pkgver=3.14.4
+pkgver=3.14.5
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -22,17 +22,15 @@
'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'
)
sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
- 'af640ea64e923d525a8238832e8452381e6dc76a3bf28046411cadd67c408114'
+ 'ecc00856830c05736b3f99609bc6d80353c29d2db9b0dffb91eb2d169808cac4'
'c01d212694eddcf694c55e0943bf3336b6e1ff41b90ac1cdc88b26789785ed45'
'9a33feb450005a43bf9aa8fbb74b2e463c72ea17ad06bab3357f8a0a89088e85'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
@@ -40,13 +38,11 @@
'6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
'52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
'65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
- '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
'3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
'04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
'79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
- 'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
'384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4')
_kernelname=${pkgbase#linux}
@@ -72,10 +68,6 @@
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
@@ -98,11 +90,6 @@
# 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
More information about the arch-commits
mailing list