summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-04-04 01:10:04 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-04-04 01:10:04 -0300
commit64117aae0f7248f9c1cd43ef4eb2ef5790924f06 (patch)
tree3d656c3d42aacf6a230e8ac95b3a3a24a000f827
parentfdf42797fdbf90d5913c730458d5484a9b440382 (diff)
downloadabslibre-64117aae0f7248f9c1cd43ef4eb2ef5790924f06.tar.gz
abslibre-64117aae0f7248f9c1cd43ef4eb2ef5790924f06.tar.bz2
abslibre-64117aae0f7248f9c1cd43ef4eb2ef5790924f06.zip
linux-libre-3.14-3: updating revision
* enable CONFIG_INFINIBAND_IPOIB_CM (FS#39701 => https://bugs.archlinux.org/task/39701) * disable X86_SYSFB and FB_SIMPLE (FS#39715 => https://bugs.archlinux.org/task/39715) * fix FSID of rootfs being 0 For st_dev in struct stat, the value 0 is an error. Make sure rootfs has value 1. This fixes the coreutils cp -ax issue (although that code has already been improved in coreutils, too) and somewhat fixes the switch_root problem in util-linux. It is still possible that rootfs gets an FSID >1 in future versions, so util-linux still needs to be fixed. This is unrelated to the mount id issue in /proc/*/mountinfo - the mount id may still be zero. * revert a patch that always enables autosuspend on intel bluetoothh xhci still sucks and breaks this. I am reverting this commit for reasons that are in no way selfish.
-rw-r--r--libre-testing/linux-libre/0001-Bluetooth-allocate-static-minor-for-vhci.patch2
-rw-r--r--libre-testing/linux-libre/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch2
-rw-r--r--libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch2
-rw-r--r--libre-testing/linux-libre/0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch2
-rw-r--r--libre-testing/linux-libre/0005-fs-Don-t-return-0-from-get_anon_bdev.patch44
-rw-r--r--libre-testing/linux-libre/0006-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch33
-rw-r--r--libre-testing/linux-libre/PKGBUILD29
-rw-r--r--libre-testing/linux-libre/config.i6866
-rw-r--r--libre-testing/linux-libre/config.x86_646
9 files changed, 108 insertions, 18 deletions
diff --git a/libre-testing/linux-libre/0001-Bluetooth-allocate-static-minor-for-vhci.patch b/libre-testing/linux-libre/0001-Bluetooth-allocate-static-minor-for-vhci.patch
index eaf24f958..26a271cf1 100644
--- a/libre-testing/linux-libre/0001-Bluetooth-allocate-static-minor-for-vhci.patch
+++ b/libre-testing/linux-libre/0001-Bluetooth-allocate-static-minor-for-vhci.patch
@@ -1,7 +1,7 @@
From 5d77ba2d26110c678b40fd723866a17d4036de12 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 18 Feb 2014 02:19:26 -0300
-Subject: [PATCH 1/4] Bluetooth: allocate static minor for vhci
+Subject: [PATCH 1/6] Bluetooth: allocate static minor for vhci
Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
driver) added the module alias to hci_vhci module so it's possible to
diff --git a/libre-testing/linux-libre/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch b/libre-testing/linux-libre/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch
index f969457d7..62f2341cd 100644
--- a/libre-testing/linux-libre/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch
+++ b/libre-testing/linux-libre/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch
@@ -1,7 +1,7 @@
From 9bc5b710f5957763d6944f38143b627d127c15ff Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 3 Feb 2014 11:14:13 +1030
-Subject: [PATCH 2/4] module: allow multiple calls to MODULE_DEVICE_TABLE() per
+Subject: [PATCH 2/6] module: allow multiple calls to MODULE_DEVICE_TABLE() per
module
Commit 78551277e4df5: "Input: i8042 - add PNP modaliases" had a bug, where the
diff --git a/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch b/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch
index c50782765..fe24e100b 100644
--- a/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch
+++ b/libre-testing/linux-libre/0003-module-remove-MODULE_GENERIC_TABLE.patch
@@ -1,7 +1,7 @@
From 06d2e746733a83469944481cb7f4fb1c7134a8ce Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 3 Feb 2014 11:15:13 +1030
-Subject: [PATCH 3/4] module: remove MODULE_GENERIC_TABLE
+Subject: [PATCH 3/6] module: remove MODULE_GENERIC_TABLE
MODULE_DEVICE_TABLE() calles MODULE_GENERIC_TABLE(); make it do the
work directly. This also removes a wart introduced in the last patch,
diff --git a/libre-testing/linux-libre/0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch b/libre-testing/linux-libre/0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch
index dd4334f58..08790cbe9 100644
--- a/libre-testing/linux-libre/0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch
+++ b/libre-testing/linux-libre/0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch
@@ -1,7 +1,7 @@
From 268984331a319f47179d6f0b62aa0e312fe4497d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
Date: Tue, 1 Apr 2014 01:15:34 +0200
-Subject: [PATCH 4/4] Revert "syscalls.h: use gcc alias instead of assembler
+Subject: [PATCH 4/6] Revert "syscalls.h: use gcc alias instead of assembler
aliases for syscalls"
This reverts commit 83460ec8dcac14142e7860a01fa59c267ac4657c.
diff --git a/libre-testing/linux-libre/0005-fs-Don-t-return-0-from-get_anon_bdev.patch b/libre-testing/linux-libre/0005-fs-Don-t-return-0-from-get_anon_bdev.patch
new file mode 100644
index 000000000..2af7cff76
--- /dev/null
+++ b/libre-testing/linux-libre/0005-fs-Don-t-return-0-from-get_anon_bdev.patch
@@ -0,0 +1,44 @@
+From 0de4ffcad031c1d0b8422ebcceb9caa80995a73e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Thu, 3 Apr 2014 21:55:37 +0200
+Subject: [PATCH 5/6] 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@vger.kernel.org>
+Signed-off-by: Thomas Bächler <thomas@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.1
+
diff --git a/libre-testing/linux-libre/0006-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/libre-testing/linux-libre/0006-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
new file mode 100644
index 000000000..de3319151
--- /dev/null
+++ b/libre-testing/linux-libre/0006-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
@@ -0,0 +1,33 @@
+From d02e0fc02f3cfa078e301698f0475adcdf6f72ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Thu, 3 Apr 2014 23:59:49 +0200
+Subject: [PATCH 6/6] Revert "Bluetooth: Enable autosuspend for Intel Bluetooth
+ device"
+
+This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1.
+
+USB autosuspend still breaks on some xhci controllers, so disable
+it by default as long as no solution is found.
+---
+ drivers/bluetooth/btusb.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index baeaaed..6d6e09e 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf,
+ if (id->driver_info & BTUSB_BCM92035)
+ hdev->setup = btusb_setup_bcm92035;
+
+- if (id->driver_info & BTUSB_INTEL) {
+- usb_enable_autosuspend(data->udev);
++ if (id->driver_info & BTUSB_INTEL)
+ hdev->setup = btusb_setup_intel;
+- }
+
+ /* Interface numbers are hardcoded in the specification */
+ data->isoc = usb_ifnum_to_if(data->udev, 1);
+--
+1.9.1
+
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index aad86c37c..88557d441 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209725 2014-04-01 20:53:27Z thomas $
+# $Id: PKGBUILD 209774 2014-04-03 22:57:31Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -13,7 +13,7 @@ _basekernel=3.14
#_sublevel=7
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=1
+pkgrel=3
_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -34,19 +34,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
'0003-module-remove-MODULE_GENERIC_TABLE.patch'
'0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch'
+ '0005-fs-Don-t-return-0-from-get_anon_bdev.patch'
+ '0006-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
- '052ef80fb78921228fcf9fa1e8b564398864f9aafda1563e66997b4fae178c62'
- '9e33e481d5c104a9c7e3d0d4cd4399467b7974cbe656a088a2e38a610f2be583'
+ 'a5211049b129aa257a05a611fd800969518368329a0e198249e7873ca3c4ae33'
+ '5a54bad7c3d660f62162227351303341b944a8290f3cd8403481822b34d73f88'
'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176'
'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
'55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
'8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
- '29a958c37e1fb04c49b1cc3be4f38b53ffdeef61ab049865209f6b77817302d0'
- 'd8db3b235d871d2b27986d3cb73a57b1d33fed52196a4b608152498a57e93838'
- 'eb9a773b7b978bc508e8459ef835ff2cb8a41bb235caff1c18c5b718d7ce902c'
- '4edd92642d710d8a351dd2acce36d412eccbf60380f9d0368ec315acb49ad704'
+ 'ad22f6e1a2869730828ddaf93da8b8a748421b7afdd34e1213566985fe7b01dd'
+ '29e612a8dda2b2b8af116c16b546a0e1d159f249bfd9628d640cad0f61f0cc4f'
+ '555133445de48e781ced3a450bcdf9bfbe4d66b118bbd5b28fea789fa023dd66'
+ 'dc1eca93dad93c9c015332d188f5a69508c2077536b8be653d2ff45f1b034941'
+ '1f572e748d96403218e846ec469474f557f04d2f5ff137dd2a31fffa193f760e'
+ 'a413700adf3b45b7d3c18d2ffed390b9e5769cb361a9a0530f98bfff29fd0aef'
'16625d5e688626de0e508b70b42b11777bb30c7903671d970d8a5cfefa32e693')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
@@ -86,6 +90,15 @@ prepare() {
# For details, see https://lkml.org/lkml/2014/1/26/22
patch -p1 -i "${srcdir}/0004-Revert-syscalls.h-use-gcc-alias-instead-of-assembler.patch"
+ # Fix various bugs caused by rootfs having FSID 0
+ # See http://www.spinics.net/lists/kernel/msg1716924.html
+ patch -p1 -i "${srcdir}/0005-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
+ patch -p1 -i "${srcdir}/0006-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686
index 17378b047..6bc496f61 100644
--- a/libre-testing/linux-libre/config.i686
+++ b/libre-testing/linux-libre/config.i686
@@ -724,7 +724,7 @@ CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m
-CONFIG_X86_SYSFB=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -4515,7 +4515,7 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -5275,7 +5275,7 @@ CONFIG_INFINIBAND_NES=m
CONFIG_INFINIBAND_OCRDMA=m
CONFIG_INFINIBAND_USNIC=m
CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
CONFIG_INFINIBAND_SRP=m
diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64
index 201a2fab8..b6e058bb9 100644
--- a/libre-testing/linux-libre/config.x86_64
+++ b/libre-testing/linux-libre/config.x86_64
@@ -700,7 +700,7 @@ CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m
-CONFIG_X86_SYSFB=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -4380,7 +4380,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -5098,7 +5098,7 @@ CONFIG_INFINIBAND_NES=m
CONFIG_INFINIBAND_OCRDMA=m
CONFIG_INFINIBAND_USNIC=m
CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
CONFIG_INFINIBAND_SRP=m