Linux v3.10.10

5 files changed, 8 insertions, 322 deletions

diff --git a/devel-pekey-secure-boot-20130502.patch b/devel-pekey-secure-boot-20130502.patch
index 703bbf5a..0a5342f8 100644
--- a/devel-pekey-secure-boot-20130502.patch
+++ b/devel-pekey-secure-boot-20130502.patch
@@ -4670,9 +4670,9 @@ index 653668d..69a6c08 100644
 --- a/arch/x86/include/asm/bootparam_utils.h
 +++ b/arch/x86/include/asm/bootparam_utils.h
 @@ -38,9 +38,13 @@ static void sanitize_boot_params(struct boot_params *boot_params)
- 		memset(&boot_params->olpc_ofw_header, 0,
+ 		memset(&boot_params->ext_ramdisk_image, 0,
  		       (char *)&boot_params->efi_info -
- 			(char *)&boot_params->olpc_ofw_header);
+ 			(char *)&boot_params->ext_ramdisk_image);
 -		memset(&boot_params->kbd_status, 0,
 +		memset(&boot_params->kbd_status, 0, sizeof(boot_params->kbd_status));
 +		/* don't clear boot_params->secure_boot.  we set that ourselves
diff --git a/iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch b/iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch
deleted file mode 100644
index 84d6aa06..00000000
--- a/iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-If channel switch is pending and we remove interface we can
-crash like showed below due to passing NULL vif to mac80211:
-
-BUG: unable to handle kernel paging request at fffffffffffff8cc
-IP: [<ffffffff8130924d>] strnlen+0xd/0x40
-Call Trace:
- [<ffffffff8130ad2e>] string.isra.3+0x3e/0xd0
- [<ffffffff8130bf99>] vsnprintf+0x219/0x640
- [<ffffffff8130c481>] vscnprintf+0x11/0x30
- [<ffffffff81061585>] vprintk_emit+0x115/0x4f0
- [<ffffffff81657bd5>] printk+0x61/0x63
- [<ffffffffa048987f>] ieee80211_chswitch_done+0xaf/0xd0 [mac80211]
- [<ffffffffa04e7b34>] iwl_chswitch_done+0x34/0x40 [iwldvm]
- [<ffffffffa04f83c3>] iwlagn_commit_rxon+0x2a3/0xdc0 [iwldvm]
- [<ffffffffa04ebc50>] ? iwlagn_set_rxon_chain+0x180/0x2c0 [iwldvm]
- [<ffffffffa04e5e76>] iwl_set_mode+0x36/0x40 [iwldvm]
- [<ffffffffa04e5f0d>] iwlagn_mac_remove_interface+0x8d/0x1b0 [iwldvm]
- [<ffffffffa0459b3d>] ieee80211_do_stop+0x29d/0x7f0 [mac80211]
-
-This is because we nulify ctx->vif in iwlagn_mac_remove_interface()
-before calling some other functions that teardown interface. To fix
-just check ctx->vif on iwl_chswitch_done(). We should not call
-ieee80211_chswitch_done() as channel switch works were already canceled
-by mac80211 in ieee80211_do_stop() -> ieee80211_mgd_stop().
-
-Resolve:
-https://bugzilla.redhat.com/show_bug.cgi?id=979581
-
-Cc: stable@vger.kernel.org
-Reported-by: Lukasz Jagiello <jagiello.lukasz@gmail.com>
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
----
- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
-index 323e4a3..9a817df 100644
---- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
-+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
-@@ -1046,7 +1046,10 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
- 	if (test_bit(STATUS_EXIT_PENDING, &priv->status))
- 		return;
- 
--	if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
-+	if (!test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
-+		return;
-+
-+	if (ctx->vif)
- 		ieee80211_chswitch_done(ctx->vif, is_success);
- }
- 
--- 
-1.7.11.7
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/kernel.spec b/kernel.spec
index 05da6ebf..0d8445f4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 201
+%global baserelease 200
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -74,7 +74,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 9
+%define stable_update 10
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -758,9 +758,6 @@ Patch25057: iwl4965-better-skb-management-in-rx-path.patch
 #rhbz 959721
 Patch25063: HID-kye-Add-report-fixup-for-Genius-Gila-Gaming-mouse.patch
 
-#rhbz 979581
-Patch25069: iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch
-
 #rhbz 969473
 Patch25070: Input-elantech-fix-for-newer-hardware-versions-v7.patch
 
@@ -1484,9 +1481,6 @@ ApplyPatch iwl4965-better-skb-management-in-rx-path.patch
 #rhbz 959721
 ApplyPatch HID-kye-Add-report-fixup-for-Genius-Gila-Gaming-mouse.patch
 
-#rhbz 979581
-ApplyPatch iwlwifi-dvm-fix-calling-ieee80211_chswitch_done-with-NULL.patch
-
 #rhbz 969473
 ApplyPatch Input-elantech-fix-for-newer-hardware-versions-v7.patch
 
@@ -2316,6 +2310,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 29 2013 Justin M. Forbes <jforbes@fedoraproject.org> 3.10.10-200
+- Linux v3.10.10
+
 * Wed Aug 28 2013 Josh Boyer <jwboyer@fedoraproject.org>
 - Add mei patches that fix various s/r issues (rhbz 994824 989373)
 
diff --git a/mei-3.10.y.patch b/mei-3.10.y.patch
index 210adac5..b0c6c34b 100644
--- a/mei-3.10.y.patch
+++ b/mei-3.10.y.patch
@@ -1,256 +1,3 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.168.104 with SMTP id zv8csp116476oab;
-        Sun, 25 Aug 2013 02:53:05 -0700 (PDT)
-X-Received: by 10.68.212.37 with SMTP id nh5mr9408188pbc.16.1377424384710;
-        Sun, 25 Aug 2013 02:53:04 -0700 (PDT)
-Return-Path: <stable-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id qf5si6944869pac.66.1969.12.31.16.00.00;
-        Sun, 25 Aug 2013 02:53:04 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=stable-owner@vger.kernel.org
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1756376Ab3HYJwV (ORCPT <rfc822;outmanzhao@gmail.com>
-	+ 58 others); Sun, 25 Aug 2013 05:52:21 -0400
-Received: from mga03.intel.com ([143.182.124.21]:34236 "EHLO mga03.intel.com"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1756234Ab3HYJwM (ORCPT <rfc822;stable@vger.kernel.org>);
-	Sun, 25 Aug 2013 05:52:12 -0400
-Received: from azsmga001.ch.intel.com ([10.2.17.19])
-  by azsmga101.ch.intel.com with ESMTP; 25 Aug 2013 02:52:12 -0700
-X-ExtLoop1: 1
-X-IronPort-AV: E=Sophos;i="4.89,951,1367996400"; 
-   d="scan'208";a="351301658"
-Received: from twinkler-dhg.jer.intel.com ([10.12.87.84])
-  by azsmga001.ch.intel.com with ESMTP; 25 Aug 2013 02:52:10 -0700
-From:	Tomas Winkler <tomas.winkler@intel.com>
-To:	gregkh@linuxfoundation.org
-Cc:	arnd@arndb.de, linux-kernel@vger.kernel.org,
-	Tomas Winkler <tomas.winkler@intel.com>, stable@vger.kernel.org
-Subject: [3.10][PATCH 1/4] mei: me: fix reset state machine
-Date:	Sun, 25 Aug 2013 12:49:46 +0300
-Message-Id: <1377424189-5508-2-git-send-email-tomas.winkler@intel.com>
-X-Mailer: git-send-email 1.8.1.2
-In-Reply-To: <1377424189-5508-1-git-send-email-tomas.winkler@intel.com>
-References: <1377424189-5508-1-git-send-email-tomas.winkler@intel.com>
-Sender:	stable-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <stable.vger.kernel.org>
-X-Mailing-List:	stable@vger.kernel.org
-
-stable: 3.10
-commit  315a383ad7dbd484fafb93ef08038e3dbafbb7a8 upstream
-
-
-ME HW ready bit is down after hw reset was asserted or on error.
-Only on error we need to enter the reset flow, additional reset
-need to be prevented when reset was triggered during
-initialization , power up/down or a reset is already in progress
-
-Cc: stable@vger.kernel.org
-Tested-by: Shuah Khan <shuah.kh@samsung.com>
-Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/misc/mei/hw-me.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
-index 822170f..0310859 100644
---- a/drivers/misc/mei/hw-me.c
-+++ b/drivers/misc/mei/hw-me.c
-@@ -482,7 +482,9 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
- 	/* check if ME wants a reset */
- 	if (!mei_hw_is_ready(dev) &&
- 	    dev->dev_state != MEI_DEV_RESETTING &&
--	    dev->dev_state != MEI_DEV_INITIALIZING) {
-+	    dev->dev_state != MEI_DEV_INITIALIZING &&
-+	    dev->dev_state != MEI_DEV_POWER_DOWN &&
-+	    dev->dev_state != MEI_DEV_POWER_UP) {
- 		dev_dbg(&dev->pdev->dev, "FW not ready.\n");
- 		mei_reset(dev, 1);
- 		mutex_unlock(&dev->device_lock);
--- 
-1.8.1.2
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.168.104 with SMTP id zv8csp116479oab;
-        Sun, 25 Aug 2013 02:53:12 -0700 (PDT)
-X-Received: by 10.68.219.104 with SMTP id pn8mr9271522pbc.81.1377424392029;
-        Sun, 25 Aug 2013 02:53:12 -0700 (PDT)
-Return-Path: <stable-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id ut10si6347816pbc.210.1969.12.31.16.00.00;
-        Sun, 25 Aug 2013 02:53:12 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=stable-owner@vger.kernel.org
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1756385Ab3HYJwW (ORCPT <rfc822;outmanzhao@gmail.com>
-	+ 58 others); Sun, 25 Aug 2013 05:52:22 -0400
-Received: from mga03.intel.com ([143.182.124.21]:34236 "EHLO mga03.intel.com"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1756301Ab3HYJwO (ORCPT <rfc822;stable@vger.kernel.org>);
-	Sun, 25 Aug 2013 05:52:14 -0400
-Received: from azsmga001.ch.intel.com ([10.2.17.19])
-  by azsmga101.ch.intel.com with ESMTP; 25 Aug 2013 02:52:14 -0700
-X-ExtLoop1: 1
-X-IronPort-AV: E=Sophos;i="4.89,951,1367996400"; 
-   d="scan'208";a="351301662"
-Received: from twinkler-dhg.jer.intel.com ([10.12.87.84])
-  by azsmga001.ch.intel.com with ESMTP; 25 Aug 2013 02:52:12 -0700
-From:	Tomas Winkler <tomas.winkler@intel.com>
-To:	gregkh@linuxfoundation.org
-Cc:	arnd@arndb.de, linux-kernel@vger.kernel.org,
-	Tomas Winkler <tomas.winkler@intel.com>, stable@vger.kernel.org
-Subject: [3.10][PATCH 2/4] mei: don't have to clean the state on power up
-Date:	Sun, 25 Aug 2013 12:49:47 +0300
-Message-Id: <1377424189-5508-3-git-send-email-tomas.winkler@intel.com>
-X-Mailer: git-send-email 1.8.1.2
-In-Reply-To: <1377424189-5508-1-git-send-email-tomas.winkler@intel.com>
-References: <1377424189-5508-1-git-send-email-tomas.winkler@intel.com>
-Sender:	stable-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <stable.vger.kernel.org>
-X-Mailing-List:	stable@vger.kernel.org
-
-stable: 3.10
-commit 99f22c4ef24cf87b0dae6aabe6b5e620b62961d9 upstream
-
-When powering up, we don't have to clean up the device state
-nothing is connected.
-
-Cc: stable@vger.kernel.org
-Tested-by: Shuah Khan <shuah.kh@samsung.com>
-Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/misc/mei/init.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
-index f580d30..6eec689 100644
---- a/drivers/misc/mei/init.c
-+++ b/drivers/misc/mei/init.c
-@@ -143,7 +143,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
- 
- 	dev->hbm_state = MEI_HBM_IDLE;
- 
--	if (dev->dev_state != MEI_DEV_INITIALIZING) {
-+	if (dev->dev_state != MEI_DEV_INITIALIZING &&
-+	    dev->dev_state != MEI_DEV_POWER_UP) {
- 		if (dev->dev_state != MEI_DEV_DISABLED &&
- 		    dev->dev_state != MEI_DEV_POWER_DOWN)
- 			dev->dev_state = MEI_DEV_RESETTING;
--- 
-1.8.1.2
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.168.104 with SMTP id zv8csp116502oab;
-        Sun, 25 Aug 2013 02:54:30 -0700 (PDT)
-X-Received: by 10.68.102.165 with SMTP id fp5mr9198656pbb.83.1377424469866;
-        Sun, 25 Aug 2013 02:54:29 -0700 (PDT)
-Return-Path: <stable-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id yk3si6904106pac.244.1969.12.31.16.00.00;
-        Sun, 25 Aug 2013 02:54:29 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=stable-owner@vger.kernel.org
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1756437Ab3HYJwo (ORCPT <rfc822;outmanzhao@gmail.com>
-	+ 58 others); Sun, 25 Aug 2013 05:52:44 -0400
-Received: from mga03.intel.com ([143.182.124.21]:34236 "EHLO mga03.intel.com"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1756338Ab3HYJwQ (ORCPT <rfc822;stable@vger.kernel.org>);
-	Sun, 25 Aug 2013 05:52:16 -0400
-Received: from azsmga001.ch.intel.com ([10.2.17.19])
-  by azsmga101.ch.intel.com with ESMTP; 25 Aug 2013 02:52:16 -0700
-X-ExtLoop1: 1
-X-IronPort-AV: E=Sophos;i="4.89,951,1367996400"; 
-   d="scan'208";a="351301665"
-Received: from twinkler-dhg.jer.intel.com ([10.12.87.84])
-  by azsmga001.ch.intel.com with ESMTP; 25 Aug 2013 02:52:14 -0700
-From:	Tomas Winkler <tomas.winkler@intel.com>
-To:	gregkh@linuxfoundation.org
-Cc:	arnd@arndb.de, linux-kernel@vger.kernel.org,
-	Tomas Winkler <tomas.winkler@intel.com>, stable@vger.kernel.org
-Subject: [3.10][PATCH 3/4] mei: me: fix waiting for hw ready
-Date:	Sun, 25 Aug 2013 12:49:48 +0300
-Message-Id: <1377424189-5508-4-git-send-email-tomas.winkler@intel.com>
-X-Mailer: git-send-email 1.8.1.2
-In-Reply-To: <1377424189-5508-1-git-send-email-tomas.winkler@intel.com>
-References: <1377424189-5508-1-git-send-email-tomas.winkler@intel.com>
-Sender:	stable-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <stable.vger.kernel.org>
-X-Mailing-List:	stable@vger.kernel.org
-
-stable: 3.10
-commit dab9bf41b23fe700c4a74133e41eb6a21706031e upstream
-
-
-1. MEI_INTEROP_TIMEOUT is in seconds not in jiffies
-so we use mei_secs_to_jiffies macro
-While cold boot is fast this is relevant in resume
-2. wait_event_interruptible_timeout can return with
--ERESTARTSYS so do not override it with -ETIMEDOUT
-3.Adjust error message
-
-Cc: stable@vger.kernel.org
-Tested-by: Shuah Khan <shuah.kh@samsung.com>
-Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/misc/mei/hw-me.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
-index 0310859..700fe55 100644
---- a/drivers/misc/mei/hw-me.c
-+++ b/drivers/misc/mei/hw-me.c
-@@ -238,14 +238,18 @@ static int mei_me_hw_ready_wait(struct mei_device *dev)
- 	if (mei_me_hw_is_ready(dev))
- 		return 0;
- 
-+	dev->recvd_hw_ready = false;
- 	mutex_unlock(&dev->device_lock);
- 	err = wait_event_interruptible_timeout(dev->wait_hw_ready,
--			dev->recvd_hw_ready, MEI_INTEROP_TIMEOUT);
-+			dev->recvd_hw_ready,
-+			mei_secs_to_jiffies(MEI_INTEROP_TIMEOUT));
- 	mutex_lock(&dev->device_lock);
- 	if (!err && !dev->recvd_hw_ready) {
-+		if (!err)
-+			err = -ETIMEDOUT;
- 		dev_err(&dev->pdev->dev,
--			"wait hw ready failed. status = 0x%x\n", err);
--		return -ETIMEDOUT;
-+			"wait hw ready failed. status = %d\n", err);
-+		return err;
- 	}
- 
- 	dev->recvd_hw_ready = false;
--- 
-1.8.1.2
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-                                                                                                                                                                                                                                                               
 Delivered-To: jwboyer@gmail.com
 Received: by 10.76.168.104 with SMTP id zv8csp116477oab;
         Sun, 25 Aug 2013 02:53:06 -0700 (PDT)
diff --git a/sources b/sources
index 25af45e9..0479b31a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
-868d7f5315f95da5e48ed56691a36263  patch-3.10.9.xz
+d010ef17d3e577fd1bdcb6887f2b9836  patch-3.10.10.xz