[arch-commits] Commit in linux/trunk (6 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Sun Jun 8 09:15:09 UTC 2014
Date: Sunday, June 8, 2014 @ 11:15:08
Author: tpowa
Revision: 214378
upgpkg: linux 3.14.6-1
bump to latest version
Modified:
linux/trunk/PKGBUILD
linux/trunk/config
linux/trunk/config.x86_64
Deleted:
linux/trunk/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
linux/trunk/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch
linux/trunk/0015-fix-xsdt-validation.patch
-----------------------------------------------------------------+
0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch | 33 ------
0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch | 52 ----------
0015-fix-xsdt-validation.patch | 42 --------
PKGBUILD | 37 +------
config | 5
config.x86_64 | 5
6 files changed, 12 insertions(+), 162 deletions(-)
Deleted: 0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
===================================================================
--- 0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch 2014-06-08 08:29:44 UTC (rev 214377)
+++ 0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch 2014-06-08 09:15:08 UTC (rev 214378)
@@ -1,33 +0,0 @@
-From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
-Date: Thu, 3 Apr 2014 23:59:49 +0200
-Subject: [PATCH 05/10] 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.2
-
Deleted: 0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch
===================================================================
--- 0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch 2014-06-08 08:29:44 UTC (rev 214377)
+++ 0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch 2014-06-08 09:15:08 UTC (rev 214378)
@@ -1,52 +0,0 @@
-From 784c4f0b18f89922ddc0fe21e5ec64cc370bb3f2 Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg at intel.com>
-Date: Wed, 19 Mar 2014 18:36:39 +0100
-Subject: [PATCH 10/10] iwlwifi: mvm: delay enabling smart FIFO until after
- beacon RX
-
-If we have no beacon data before association, delay smart FIFO
-enablement until after we have this data.
-
-Not doing so can cause association failures in extremely silent
-environments (usually only a shielded box/room) as beacon RX is
-not sent to the host immediately, and then the association time
-event ends without the host receiving any beacon even though it
-was on the air - it's just stuck on the FIFO.
-
-Cc: <stable at vger.kernel.org> [3.14]
-Signed-off-by: Johannes Berg <johannes.berg at intel.com>
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
----
- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 +
- drivers/net/wireless/iwlwifi/mvm/sf.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
-index c35b866..45e861e 100644
---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
-@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
- */
- iwl_mvm_remove_time_event(mvm, mvmvif,
- &mvmvif->time_event_data);
-+ iwl_mvm_sf_update(mvm, vif, false);
- } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS |
- BSS_CHANGED_QOS)) {
- ret = iwl_mvm_power_update_mode(mvm, vif);
-diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c
-index 8401627..88809b2 100644
---- a/drivers/net/wireless/iwlwifi/mvm/sf.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c
-@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif,
- return -EINVAL;
- if (changed_vif->type != NL80211_IFTYPE_STATION) {
- new_state = SF_UNINIT;
-- } else if (changed_vif->bss_conf.assoc) {
-+ } else if (changed_vif->bss_conf.assoc &&
-+ changed_vif->bss_conf.dtim_period) {
- mvmvif = iwl_mvm_vif_from_mac80211(changed_vif);
- sta_id = mvmvif->ap_sta_id;
- new_state = SF_FULL_ON;
---
-1.9.2
-
Deleted: 0015-fix-xsdt-validation.patch
===================================================================
--- 0015-fix-xsdt-validation.patch 2014-06-08 08:29:44 UTC (rev 214377)
+++ 0015-fix-xsdt-validation.patch 2014-06-08 09:15:08 UTC (rev 214378)
@@ -1,42 +0,0 @@
-@@ -, +, @@
- acpi_tb_parse_root_table().
- Commit: 671cc68dc61f029d44b43a681356078e02d8dab8
- Subject: ACPICA: Back port and refine validation of the XSDT root table.
----
- drivers/acpi/acpica/tbutils.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
---- a/drivers/acpi/acpica/tbutils.c
-+++ a/drivers/acpi/acpica/tbutils.c
-@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
- u32 table_count;
- struct acpi_table_header *table;
- acpi_physical_address address;
-+ acpi_physical_address rsdt_address;
- u32 length;
- u8 *table_entry;
- acpi_status status;
-@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
- * as per the ACPI specification.
- */
- address = (acpi_physical_address) rsdp->xsdt_physical_address;
-+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address;
- table_entry_size = ACPI_XSDT_ENTRY_SIZE;
- } else {
- /* Root table is an RSDT (32-bit physical addresses) */
-
- address = (acpi_physical_address) rsdp->rsdt_physical_address;
-+ rsdt_address = address;
- table_entry_size = ACPI_RSDT_ENTRY_SIZE;
- }
-
-@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
-
- /* Fall back to the RSDT */
-
-- address =
-- (acpi_physical_address) rsdp->rsdt_physical_address;
-+ address = rsdt_address;
- table_entry_size = ACPI_RSDT_ENTRY_SIZE;
- }
- }
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-08 08:29:44 UTC (rev 214377)
+++ PKGBUILD 2014-06-08 09:15:08 UTC (rev 214378)
@@ -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.5
+pkgver=3.14.6
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -22,28 +22,21 @@
'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'
- '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'
- '0015-fix-xsdt-validation.patch'
)
+# vim:set ts=8 sts=2 sw=2 et:
sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
- 'ecc00856830c05736b3f99609bc6d80353c29d2db9b0dffb91eb2d169808cac4'
- 'c01d212694eddcf694c55e0943bf3336b6e1ff41b90ac1cdc88b26789785ed45'
- '9a33feb450005a43bf9aa8fbb74b2e463c72ea17ad06bab3357f8a0a89088e85'
+ 'b8de86f64a62ec1f5d62ef7b0caf302546be0d397e7c7d29e4b1e260220462d7'
+ '73056e6f23119c53c79f36f4c2faf37dd5a195d63605fa26392aa11ae9edfb62'
+ 'f44bd4a40f9ce0675a5601c4a1e1688c7368118c4a5374be9832611b348eb956'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
'6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
'52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
'65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
- '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
- 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
- '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
- '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
- '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4')
+ '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18')
_kernelname=${pkgbase#linux}
@@ -68,33 +61,15 @@
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"
- # 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}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch"
-
# Fix generation of symbol CRCs
# http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18
patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch"
- # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d
- # FS#39815
- patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch"
-
- # fix Xorg crash with i810 chipset due to wrong removed error check
- # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com
- patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch"
-
# fix saa7134 video
# https://bugs.archlinux.org/task/39904
# https://bugzilla.kernel.org/show_bug.cgi?id=73361
patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
- # fix xsdt validation bug
- # https://bugs.archlinux.org/task/39811
- # https://bugzilla.kernel.org/show_bug.cgi?id=73911
- patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch"
-
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
else
Modified: config
===================================================================
--- config 2014-06-08 08:29:44 UTC (rev 214377)
+++ config 2014-06-08 09:15:08 UTC (rev 214378)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.0-4 Kernel Configuration
+# Linux/x86 3.14.6-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -208,6 +208,7 @@
# CONFIG_SLAB is not set
CONFIG_SLUB=y
CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
@@ -270,7 +271,6 @@
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -535,6 +535,7 @@
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
Modified: config.x86_64
===================================================================
--- config.x86_64 2014-06-08 08:29:44 UTC (rev 214377)
+++ config.x86_64 2014-06-08 09:15:08 UTC (rev 214378)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.0-4 Kernel Configuration
+# Linux/x86 3.14.6-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -217,6 +217,7 @@
# CONFIG_SLAB is not set
CONFIG_SLUB=y
CONFIG_SLUB_CPU_PARTIAL=y
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
@@ -281,7 +282,6 @@
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -543,6 +543,7 @@
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
More information about the arch-commits
mailing list