Linux v3.12-8333-g4fbf888

- Build tmon in kernel-tools
- Disable ARM NEON optimised AES and OMAP2PLUS cpufreq because they don't build

11 files changed, 67 insertions, 350 deletions

diff --git a/PatchList.txt b/PatchList.txt
index 9d1460cf4..2ee388846 100644
--- a/PatchList.txt
+++ b/PatchList.txt
@@ -15,10 +15,6 @@
 * iommu-Remove-stack-trace-from-broken-irq-remapping-warning.patch (rhbz 982153)
   - Still pending upstream
 
-* elevator-Fix-a-race-in-elevator-switching-and-md.patch
-* elevator-acquire-q-sysfs_lock-in-elevator_change.patch (rhbz 902012)
-  - I believe these are both queued for the next upstream release
-
 * ansi_cprng-Fix-off-by-one-error-in-non-block-size-request.patch (rhbz 1007690 1009136)
   - Fixes CVE-2013-4345
 
diff --git a/config-arm-generic b/config-arm-generic
index c35084902..5bc924bbb 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -8,6 +8,9 @@ CONFIG_MMC=y
 CONFIG_NFS_FS=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_BIG_LITTLE is not set
+
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 
diff --git a/config-armv7 b/config-armv7
index 7d4269793..ebb51c650 100644
--- a/config-armv7
+++ b/config-armv7
@@ -188,7 +188,7 @@ CONFIG_POWER_AVS=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -233,6 +233,7 @@ CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
 CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
+CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
 
 # Enable V4L2 drivers for OMAP2+
 CONFIG_MEDIA_CONTROLLER=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 2b0fa2a0c..eb799118c 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -268,7 +268,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # HW crypto and rng
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
-CONFIG_CRYPTO_AES_ARM_BS=m
+# CONFIG_CRYPTO_AES_ARM_BS is not set
 
 # DMA
 CONFIG_TI_PRIV_EDMA=y
diff --git a/config-generic b/config-generic
index f80c276e1..c791e0a92 100644
--- a/config-generic
+++ b/config-generic
@@ -309,6 +309,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # Block devices
 #
 CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
 
@@ -325,6 +326,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_SKD=m # 64-bit only but easier to put here
 CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -4508,6 +4510,7 @@ CONFIG_IBMASR=m
 CONFIG_PM=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_PM_TEST_SUSPEND=y
@@ -5078,6 +5081,8 @@ CONFIG_FMC_TRIVIAL=m
 CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FMC_CHARDEV=m
 
+# CONFIG_POWERCAP is not set
+
 # CONFIG_HSI is not set
 
 # CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
diff --git a/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch b/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
index 71234c1a7..48bb5050d 100644
--- a/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
+++ b/dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
@@ -1,17 +1,17 @@
 diff --git a/drivers/md/dm-cache-policy-mq.c b/drivers/md/dm-cache-policy-mq.c
-index cab6dd2..ec79c8f 100644
+index 416b7b7..9105771 100644
 --- a/drivers/md/dm-cache-policy-mq.c
 +++ b/drivers/md/dm-cache-policy-mq.c
-@@ -868,7 +868,7 @@ static void mq_destroy(struct dm_cache_policy *p)
+@@ -866,7 +866,7 @@ static void mq_destroy(struct dm_cache_policy *p)
+ {
  	struct mq_policy *mq = to_mq_policy(p);
  
- 	free_bitset(mq->allocation_bitset);
 -	kfree(mq->table);
 +	vfree(mq->table);
- 	free_entries(mq);
+ 	epool_exit(&mq->cache_pool);
+ 	epool_exit(&mq->pre_cache_pool);
  	kfree(mq);
- }
-@@ -1189,7 +1189,7 @@ static struct dm_cache_policy *mq_create(dm_cblock_t cache_size,
+@@ -1221,7 +1221,7 @@ static struct dm_cache_policy *mq_create(dm_cblock_t cache_size,
  
  	mq->nr_buckets = next_power(from_cblock(cache_size) / 2, 16);
  	mq->hash_bits = ffs(mq->nr_buckets) - 1;
@@ -20,12 +20,3 @@ index cab6dd2..ec79c8f 100644
  	if (!mq->table)
  		goto bad_alloc_table;
  
-@@ -1200,7 +1200,7 @@ static struct dm_cache_policy *mq_create(dm_cblock_t cache_size,
- 	return &mq->policy;
- 
- bad_alloc_bitset:
--	kfree(mq->table);
-+	vfree(mq->table);
- bad_alloc_table:
- 	free_entries(mq);
- bad_cache_alloc:
diff --git a/elevator-Fix-a-race-in-elevator-switching-and-md.patch b/elevator-Fix-a-race-in-elevator-switching-and-md.patch
deleted file mode 100644
index 5517687ff..000000000
--- a/elevator-Fix-a-race-in-elevator-switching-and-md.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.168.104 with SMTP id zv8csp55663oab;
-        Fri, 30 Aug 2013 15:52:46 -0700 (PDT)
-X-Received: by 10.68.244.168 with SMTP id xh8mr12419215pbc.3.1377903166373;
-        Fri, 30 Aug 2013 15:52:46 -0700 (PDT)
-Return-Path: <linux-kernel-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id qc9si280431pac.269.1969.12.31.16.00.00;
-        Fri, 30 Aug 2013 15:52:46 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org;
-       dkim=neutral (bad format) header.i=@hds.com
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1753535Ab3H3WrV (ORCPT <rfc822;georgezhim@gmail.com>
-	+ 99 others); Fri, 30 Aug 2013 18:47:21 -0400
-Received: from usindpps04.hds.com ([207.126.252.17]:35636 "EHLO
-	usindpps04.hds.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752650Ab3H3WrU (ORCPT
-	<rfc822;linux-kernel@vger.kernel.org>);
-	Fri, 30 Aug 2013 18:47:20 -0400
-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/simple; d=hds.com; h=subject : to : from : cc
- : date : message-id : mime-version : content-type :
- content-transfer-encoding; s=mail1;
- bh=VofHN8IMnygn2hbqnFjLmX0PPEPbvpzE377u1RxpGOY=;
- b=piW6J78W57qDXBPJJuodWw/tvf0T//JbxKX6sLPvpuaOG2nBLMHzDqUeTYwFEQqUvdmf
- ZTkiwsKi0WEku3MKcxJ7veR7wvTZcQ4fGMETFTf1c2J/1JOKpXLnft4ERuW89/FAxw25
- wQM1ulsuQ3Cncl0I/sIaqMlaMOtvuQ/C8rsHorp+75eFiL6yx1jU5wMbuti4D/NprIET
- 3r57cPZ0YCh6sLjvOgjay6mKyktMToyjHPx6X1TWCSWcwes33Popc1hpadxUdFI/0npL
- mN3Tttbe7e2RcmkXAZbwg8xj+FwSu3nIRC4G9UpFCsMz518C/AWZj4puwWE6VHZWVvVZ Rg== 
-Received: from usindmail01.hds.com (usindmail03 [207.126.252.22])
-	by usindpps04.hds.com (8.14.5/8.14.5) with ESMTP id r7UMlBjr025492;
-	Fri, 30 Aug 2013 18:47:11 -0400
-Received: from hds.com (usindnetf5d-vlan47float.corp.hds.com [10.74.73.11])
-	by usindmail01.hds.com (8.14.1/8.14.1) with ESMTP id r7UMl8SG058466;
-	Fri, 30 Aug 2013 18:47:10 -0400 (EDT)
-Subject: [PATCH v2 1/2] elevator: Fix a race in elevator switching and md
- device initialization
-To:	linux-kernel@vger.kernel.org
-From:	Tomoki Sekiyama <tomoki.sekiyama@hds.com>
-Cc:	axboe@kernel.dk, tj@kernel.org, seiji.aguchi@hds.com,
-	vgoyal@redhat.com, majianpeng@gmail.com
-Date:	Fri, 30 Aug 2013 18:47:07 -0400
-Message-ID: <20130830224707.21812.63516.stgit@hds.com>
-User-Agent: StGit/0.16
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-X-Proofpoint-SPF-Result: pass
-X-Proofpoint-SPF-Record: v=spf1 mx ip4:207.126.244.0/26 ip4:207.126.252.0/25 include:mktomail.com
- include:cloud.hds.com ~all
-X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794,1.0.431,0.0.0000
- definitions=2013-08-30_09:2013-08-30,2013-08-30,1970-01-01 signatures=0
-X-Proofpoint-Spam-Details: rule=notspam policy=outbound_policy score=0 spamscore=0 suspectscore=1
- phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx
- scancount=1 engine=7.0.1-1305240000 definitions=main-1308300162
-Sender:	linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List:	linux-kernel@vger.kernel.org
-
-The soft lockup below happens at the boot time of the system using dm
-multipath and the udev rules to switch scheduler.
-
-[  356.127001] BUG: soft lockup - CPU#3 stuck for 22s! [sh:483]
-[  356.127001] RIP: 0010:[<ffffffff81072a7d>]  [<ffffffff81072a7d>] lock_timer_base.isra.35+0x1d/0x50
-...
-[  356.127001] Call Trace:
-[  356.127001]  [<ffffffff81073810>] try_to_del_timer_sync+0x20/0x70
-[  356.127001]  [<ffffffff8118b08a>] ? kmem_cache_alloc_node_trace+0x20a/0x230
-[  356.127001]  [<ffffffff810738b2>] del_timer_sync+0x52/0x60
-[  356.127001]  [<ffffffff812ece22>] cfq_exit_queue+0x32/0xf0
-[  356.127001]  [<ffffffff812c98df>] elevator_exit+0x2f/0x50
-[  356.127001]  [<ffffffff812c9f21>] elevator_change+0xf1/0x1c0
-[  356.127001]  [<ffffffff812caa50>] elv_iosched_store+0x20/0x50
-[  356.127001]  [<ffffffff812d1d09>] queue_attr_store+0x59/0xb0
-[  356.127001]  [<ffffffff812143f6>] sysfs_write_file+0xc6/0x140
-[  356.127001]  [<ffffffff811a326d>] vfs_write+0xbd/0x1e0
-[  356.127001]  [<ffffffff811a3ca9>] SyS_write+0x49/0xa0
-[  356.127001]  [<ffffffff8164e899>] system_call_fastpath+0x16/0x1b
-
-This is caused by a race between md device initialization by multipathd and
-shell script to switch the scheduler using sysfs.
-
- - multipathd:
-   SyS_ioctl -> do_vfs_ioctl -> dm_ctl_ioctl -> ctl_ioctl -> table_load
-   -> dm_setup_md_queue -> blk_init_allocated_queue -> elevator_init
-    q->elevator = elevator_alloc(q, e); // not yet initialized
-
- - sh -c 'echo deadline > /sys/$DEVPATH/queue/scheduler':
-   elevator_switch (in the call trace above)
-    struct elevator_queue *old = q->elevator;
-    q->elevator = elevator_alloc(q, new_e);
-    elevator_exit(old);                 // lockup! (*)
-
- - multipathd: (cont.)
-    err = e->ops.elevator_init_fn(q);   // init fails; q->elevator is modified
-
-(*) When del_timer_sync() is called, lock_timer_base() will loop infinitely
-while timer->base == NULL. In this case, as timer will never initialized,
-it results in lockup.
-
-This patch introduces acquisition of q->sysfs_lock around elevator_init()
-into blk_init_allocated_queue(), to provide mutual exclusion between
-initialization of the q->scheduler and switching of the scheduler.
-
-This should fix this bugzilla:
-https://bugzilla.redhat.com/show_bug.cgi?id=902012
-
-Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
----
- block/blk-core.c |   10 +++++++++-
- block/elevator.c |    6 ++++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/block/blk-core.c b/block/blk-core.c
-index 93a18d1..2f6275f 100644
---- a/block/blk-core.c
-+++ b/block/blk-core.c
-@@ -739,9 +739,17 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
- 
- 	q->sg_reserved_size = INT_MAX;
- 
-+	/* Protect q->elevator from elevator_change */
-+	mutex_lock(&q->sysfs_lock);
-+
- 	/* init elevator */
--	if (elevator_init(q, NULL))
-+	if (elevator_init(q, NULL)) {
-+		mutex_unlock(&q->sysfs_lock);
- 		return NULL;
-+	}
-+
-+	mutex_unlock(&q->sysfs_lock);
-+
- 	return q;
- }
- EXPORT_SYMBOL(blk_init_allocated_queue);
-diff --git a/block/elevator.c b/block/elevator.c
-index 668394d..02d4390 100644
---- a/block/elevator.c
-+++ b/block/elevator.c
-@@ -186,6 +186,12 @@ int elevator_init(struct request_queue *q, char *name)
- 	struct elevator_type *e = NULL;
- 	int err;
- 
-+	/*
-+	 * q->sysfs_lock must be held to provide mutual exclusion between
-+	 * elevator_switch() and here.
-+	 */
-+	lockdep_assert_held(&q->sysfs_lock);
-+
- 	if (unlikely(q->elevator))
- 		return 0;
- 
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/elevator-acquire-q-sysfs_lock-in-elevator_change.patch b/elevator-acquire-q-sysfs_lock-in-elevator_change.patch
deleted file mode 100644
index 6f112b81c..000000000
--- a/elevator-acquire-q-sysfs_lock-in-elevator_change.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.168.104 with SMTP id zv8csp55623oab;
-        Fri, 30 Aug 2013 15:51:42 -0700 (PDT)
-X-Received: by 10.67.30.70 with SMTP id kc6mr13149193pad.32.1377903101609;
-        Fri, 30 Aug 2013 15:51:41 -0700 (PDT)
-Return-Path: <linux-kernel-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id gg2si304840pac.217.1969.12.31.16.00.00;
-        Fri, 30 Aug 2013 15:51:41 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org;
-       dkim=neutral (bad format) header.i=@hds.com
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1756106Ab3H3WrX (ORCPT <rfc822;georgezhim@gmail.com>
-	+ 99 others); Fri, 30 Aug 2013 18:47:23 -0400
-Received: from usindpps04.hds.com ([207.126.252.17]:35640 "EHLO
-	usindpps04.hds.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752650Ab3H3WrW (ORCPT
-	<rfc822;linux-kernel@vger.kernel.org>);
-	Fri, 30 Aug 2013 18:47:22 -0400
-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/simple; d=hds.com; h=subject : to : from : cc
- : date : message-id : in-reply-to : references : mime-version :
- content-type : content-transfer-encoding; s=mail1;
- bh=xbQuWVaSJrPfWG5E7bXFAbOFjf/sBaRZsPmpVgy0CYk=;
- b=NW/A8Imu32MXoBi5FLrQ0FsK66RTWMQo1bFRtgQplVEQQIAXyf1XhCaAZyTkTplc0iEx
- ovyGZHvLbmGL6w3I3pxkCFz1BPJCqoZtvQITir/WvfzyadYOK1cz+vuBUQSCmfkacvS/
- w37h1jLAjsvWXkl0GY7pxB9HJMXdeLnhhuWxtNU8m8rKZ7t3LSByMeQi5/3OTkNojDEe
- 70cKeZXCPQ/UIDJAF4cpSVXia5FwoJISjXvQIrvqkYhFelzq3OHMcC482PdpqNB475h3
- yHHJ83HFOLRulUQdOG5ZVTB9qRg0zxRx/oedeXwzturFke68noRRa4f4izQ8sCwsWOCI Dw== 
-Received: from usindmail01.hds.com (usindmail03 [207.126.252.22])
-	by usindpps04.hds.com (8.14.5/8.14.5) with ESMTP id r7UMlHIc025543;
-	Fri, 30 Aug 2013 18:47:17 -0400
-Received: from hds.com (usindnetf5d-vlan47float.corp.hds.com [10.74.73.11])
-	by usindmail01.hds.com (8.14.1/8.14.1) with ESMTP id r7UMlGiC058545;
-	Fri, 30 Aug 2013 18:47:17 -0400 (EDT)
-Subject: [PATCH v2 2/2] elevator: acquire q->sysfs_lock in elevator_change()
-To:	linux-kernel@vger.kernel.org
-From:	Tomoki Sekiyama <tomoki.sekiyama@hds.com>
-Cc:	axboe@kernel.dk, tj@kernel.org, seiji.aguchi@hds.com,
-	vgoyal@redhat.com, majianpeng@gmail.com
-Date:	Fri, 30 Aug 2013 18:47:16 -0400
-Message-ID: <20130830224716.21812.99333.stgit@hds.com>
-In-Reply-To: <20130830224707.21812.63516.stgit@hds.com>
-References: <20130830224707.21812.63516.stgit@hds.com>
-User-Agent: StGit/0.16
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-X-Proofpoint-SPF-Result: pass
-X-Proofpoint-SPF-Record: v=spf1 mx ip4:207.126.244.0/26 ip4:207.126.252.0/25 include:mktomail.com
- include:cloud.hds.com ~all
-X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794,1.0.431,0.0.0000
- definitions=2013-08-30_09:2013-08-30,2013-08-30,1970-01-01 signatures=0
-X-Proofpoint-Spam-Details: rule=notspam policy=outbound_policy score=0 spamscore=0 suspectscore=1
- phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx
- scancount=1 engine=7.0.1-1305240000 definitions=main-1308300162
-Sender:	linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List:	linux-kernel@vger.kernel.org
-
-Add locking of q->sysfs_lock into elevator_change() (an exported function)
-to ensure it is held to protect q->elevator from elevator_init(), even if
-elevator_change() is called from non-sysfs paths.
-sysfs path (elv_iosched_store) uses __elevator_change(), non-locking
-version, as the lock is already taken by elv_iosched_store().
-
-Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
----
- block/elevator.c |   16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/block/elevator.c b/block/elevator.c
-index 02d4390..6d765f7 100644
---- a/block/elevator.c
-+++ b/block/elevator.c
-@@ -965,7 +965,7 @@ fail_init:
- /*
-  * Switch this queue to the given IO scheduler.
-  */
--int elevator_change(struct request_queue *q, const char *name)
-+static int __elevator_change(struct request_queue *q, const char *name)
- {
- 	char elevator_name[ELV_NAME_MAX];
- 	struct elevator_type *e;
-@@ -987,6 +987,18 @@ int elevator_change(struct request_queue *q, const char *name)
- 
- 	return elevator_switch(q, e);
- }
-+
-+int elevator_change(struct request_queue *q, const char *name)
-+{
-+	int ret;
-+
-+	/* Protect q->elevator from elevator_init() */
-+	mutex_lock(&q->sysfs_lock);
-+	ret = __elevator_change(q, name);
-+	mutex_unlock(&q->sysfs_lock);
-+
-+	return ret;
-+}
- EXPORT_SYMBOL(elevator_change);
- 
- ssize_t elv_iosched_store(struct request_queue *q, const char *name,
-@@ -997,7 +1009,7 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
- 	if (!q->elevator)
- 		return count;
- 
--	ret = elevator_change(q, name);
-+	ret = __elevator_change(q, name);
- 	if (!ret)
- 		return count;
- 
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/kernel.spec b/kernel.spec
index 10b4e3603..160fe91d3 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 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -497,7 +497,7 @@ BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel
 BuildRequires: audit-libs-devel
 %endif
 %if %{with_tools}
-BuildRequires: pciutils-devel gettext
+BuildRequires: pciutils-devel gettext ncurses-devel
 %endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 %if %{with_debuginfo}
@@ -708,10 +708,6 @@ Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
 #CVE-2013-4345 rhbz 1007690 1009136
 Patch25104: ansi_cprng-Fix-off-by-one-error-in-non-block-size-request.patch
 
-#rhbz 902012
-Patch25114: elevator-Fix-a-race-in-elevator-switching-and-md.patch
-Patch25115: elevator-acquire-q-sysfs_lock-in-elevator_change.patch
-
 #rhbz 982153
 Patch25123: iommu-Remove-stack-trace-from-broken-irq-remapping-warning.patch
 
@@ -882,7 +878,7 @@ This package provides debug information for package kernel-tools.
 # symlinks because of the trailing nonmatching alternation and
 # the leading .*, because of find-debuginfo.sh's buggy handling
 # of matching the pattern against the symlinks file.
-%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
+%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
 
 %endif # with_tools
 
@@ -1408,10 +1404,6 @@ ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch
 #CVE-2013-4345 rhbz 1007690 1009136
 ApplyPatch ansi_cprng-Fix-off-by-one-error-in-non-block-size-request.patch
 
-#rhbz 902012
-ApplyPatch elevator-Fix-a-race-in-elevator-switching-and-md.patch
-ApplyPatch elevator-acquire-q-sysfs_lock-in-elevator_change.patch
-
 #rhbz 982153
 ApplyPatch iommu-Remove-stack-trace-from-broken-irq-remapping-warning.patch
 
@@ -1817,6 +1809,9 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
    popd
 %endif #turbostat/x86_energy_perf_policy
 %endif
+pushd tools/thermal/tmon/
+%{make}
+popd
 %endif
 
 %if %{with_doc}
@@ -1973,6 +1968,9 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
    make DESTDIR=%{buildroot} install
    popd
 %endif #turbostat/x86_energy_perf_policy
+pushd tools/thermal/tmon
+make INSTALL_ROOT=%{buildroot} install
+popd
 %endif
 
 %if %{with_bootwrapper}
@@ -2151,6 +2149,7 @@ fi
 %{_bindir}/turbostat
 %{_mandir}/man8/turbostat*
 %endif
+%{_bindir}/tmon
 %endif
 
 %if %{with_debuginfo}
@@ -2238,6 +2237,11 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Nov 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git4.1
+- Linux v3.12-8333-g4fbf888
+- Build tmon in kernel-tools
+- Disable ARM NEON optimised AES and OMAP2PLUS cpufreq because they don't build
+
 * Thu Nov 14 2013 Peter Robinson <pbrobinson@fedoraproject.org>
 - Update ARM configs
 - Enable ARM NEON optimised AES
diff --git a/keys-x509-improv.patch b/keys-x509-improv.patch
index 7176cc5d3..161675819 100644
--- a/keys-x509-improv.patch
+++ b/keys-x509-improv.patch
@@ -1,4 +1,4 @@
-From 775d395f8bd8ef08971c77f54c38ec7b9355ba4f Mon Sep 17 00:00:00 2001
+From db25f1d9f45079db5860c0fd1938032248ad2f06 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:15:10 +0100
 Subject: [PATCH 01/18] KEYS: Rename public key parameter name arrays
@@ -153,7 +153,7 @@ index f2970bd..ee47640 100644
 1.8.3.1
 
 
-From d12f06db05dacb455714f00f070cce844fb3e44c Mon Sep 17 00:00:00 2001
+From 1881703e6a0943f5d45278d19ffc5268495f57a8 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:15:18 +0100
 Subject: [PATCH 02/18] KEYS: Move the algorithm pointer array from x509 to
@@ -235,7 +235,7 @@ index 619d570..46bde25 100644
 1.8.3.1
 
 
-From 8d2905bce58b356e9b5313a4aaebb5085bb4c151 Mon Sep 17 00:00:00 2001
+From 564f7dc3b31d53d195d046e6a717e9a2277296bd Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:15:24 +0100
 Subject: [PATCH 03/18] KEYS: Store public key algo ID in public_key struct
@@ -320,7 +320,7 @@ index 46bde25..05778df 100644
 1.8.3.1
 
 
-From df1662a5b9f37a88c1e112d4052eca79efc8e6fc Mon Sep 17 00:00:00 2001
+From 2666dd8e330d6792cc32e8739e89f9ad0acd04c6 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:15:30 +0100
 Subject: [PATCH 04/18] KEYS: Split public_key_verify_signature() and make
@@ -436,7 +436,7 @@ index fac574c..8cb2f70 100644
 1.8.3.1
 
 
-From 322d3b7e2debb3c7983dce2b80a5aefa4e7b1bda Mon Sep 17 00:00:00 2001
+From 9c814dcdc6d5836d82dc194f8f11ca9769251439 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:15:37 +0100
 Subject: [PATCH 05/18] KEYS: Store public key algo ID in public_key_signature
@@ -469,7 +469,7 @@ index 05778df..b34fda4 100644
 1.8.3.1
 
 
-From 743143dd12661df376dcfc916b626b01d8ec84a4 Mon Sep 17 00:00:00 2001
+From b467a1c6be1c64c6abf4efd357a348f39c4b7daa Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:16:34 +0100
 Subject: [PATCH 06/18] X.509: struct x509_certificate needs struct tm
@@ -501,7 +501,7 @@ index e583ad0..2d01182 100644
 1.8.3.1
 
 
-From a326ca89468c73dacb00fa247e92873d09e1387b Mon Sep 17 00:00:00 2001
+From 37137e9377322a4fe92f679d78f8181feefe4d21 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:18:02 +0100
 Subject: [PATCH 07/18] X.509: Embed public_key_signature struct and create
@@ -764,7 +764,7 @@ index 8cb2f70..b7c81d8 100644
 1.8.3.1
 
 
-From 2857db9154b0fcfb8ba490c12f98cd47cc3f46fc Mon Sep 17 00:00:00 2001
+From 51432bf93bf4ff11cccf91c5ca22e9e92c05f4b4 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:18:15 +0100
 Subject: [PATCH 08/18] X.509: Check the algorithm IDs obtained from parsing an
@@ -805,7 +805,7 @@ index b7c81d8..eb368d4 100644
 1.8.3.1
 
 
-From f78f0e8694517a3b1e5393d6ea0d46084bdc816a Mon Sep 17 00:00:00 2001
+From 8f943dd14f8a4d8aa2126f8544e140d019ceb36d Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:18:31 +0100
 Subject: [PATCH 09/18] X.509: Handle certificates that lack an
@@ -852,7 +852,7 @@ index eb368d4..0f55e3b 100644
 1.8.3.1
 
 
-From 4d729ace6be1c3b2b5d9b0d0301a4ffd342ec74a Mon Sep 17 00:00:00 2001
+From 89c63be02d8eea6403d6b7d7a045e8f115787a81 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 18 Jun 2013 17:40:44 +0100
 Subject: [PATCH 10/18] X.509: Remove certificate date checks
@@ -933,7 +933,7 @@ index 0f55e3b..c1540e8 100644
 1.8.3.1
 
 
-From 33f859fea67ab5307da4049e947fbc23cdd13a27 Mon Sep 17 00:00:00 2001
+From cdbd1f60c92814fa44ca968dd3fdc78c8b65400c Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:07:13 +0100
 Subject: [PATCH 11/18] KEYS: Load *.x509 files into kernel keyring
@@ -950,10 +950,10 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  2 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 1ce4755..c34e5f9 100644
+index 09a9c94..0246125 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -142,17 +142,40 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE
+@@ -123,17 +123,40 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE
  	$(call if_changed,bc)
  
  ifeq ($(CONFIG_MODULE_SIG),y)
@@ -1016,7 +1016,7 @@ index 4a9a86d..6fe03c7 100644
 1.8.3.1
 
 
-From 068606ba7df3206e5a09b544b4b89ed09cd30f44 Mon Sep 17 00:00:00 2001
+From d38add998f9fb35e901e022c14b0f771823b35e2 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 17:13:15 +0100
 Subject: [PATCH 12/18] KEYS: Have make canonicalise the paths of the X.509
@@ -1031,10 +1031,10 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/kernel/Makefile b/kernel/Makefile
-index c34e5f9..2c24195 100644
+index 0246125..c71d596 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -144,13 +144,19 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE
+@@ -125,13 +125,19 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE
  ifeq ($(CONFIG_MODULE_SIG),y)
  ###############################################################################
  #
@@ -1061,7 +1061,7 @@ index c34e5f9..2c24195 100644
 1.8.3.1
 
 
-From 9006cfbd669e9ba52d1a91db2ffd9482ad8a6090 Mon Sep 17 00:00:00 2001
+From 1e326161658f6c4bd5dba53bc2076d915400124a Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:07:30 +0100
 Subject: [PATCH 13/18] KEYS: Separate the kernel signature checking keyring
@@ -1118,10 +1118,10 @@ index 0000000..8dabc39
 +
 +#endif /* _KEYS_SYSTEM_KEYRING_H */
 diff --git a/init/Kconfig b/init/Kconfig
-index 18bd9e3..cf14d07 100644
+index 5496f30..b5c524c 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1668,6 +1668,18 @@ config BASE_SMALL
+@@ -1675,6 +1675,18 @@ config BASE_SMALL
  	default 0 if BASE_FULL
  	default 1 if !BASE_FULL
  
@@ -1140,7 +1140,7 @@ index 18bd9e3..cf14d07 100644
  menuconfig MODULES
  	bool "Enable loadable module support"
  	option modules
-@@ -1741,6 +1753,7 @@ config MODULE_SRCVERSION_ALL
+@@ -1748,6 +1760,7 @@ config MODULE_SRCVERSION_ALL
  config MODULE_SIG
  	bool "Module signature verification"
  	depends on MODULES
@@ -1149,12 +1149,12 @@ index 18bd9e3..cf14d07 100644
  	select CRYPTO
  	select ASYMMETRIC_KEY_TYPE
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 2c24195..6313698 100644
+index c71d596..bbaf7d5 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -54,8 +54,9 @@ obj-$(CONFIG_SMP) += spinlock.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
- obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
+@@ -41,8 +41,9 @@ ifneq ($(CONFIG_SMP),y)
+ obj-y += up.o
+ endif
  obj-$(CONFIG_UID16) += uid16.o
 +obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
  obj-$(CONFIG_MODULES) += module.o
@@ -1163,7 +1163,7 @@ index 2c24195..6313698 100644
  obj-$(CONFIG_KALLSYMS) += kallsyms.o
  obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
  obj-$(CONFIG_KEXEC) += kexec.o
-@@ -141,11 +142,11 @@ targets += timeconst.h
+@@ -122,11 +123,11 @@ targets += timeconst.h
  $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE
  	$(call if_changed,bc)
  
@@ -1177,7 +1177,7 @@ index 2c24195..6313698 100644
  #
  # We look in the source root and the build root for all files whose name ends
  # in ".x509".  Unfortunately, this will generate duplicate filenames, so we
-@@ -153,6 +154,7 @@ ifeq ($(CONFIG_MODULE_SIG),y)
+@@ -134,6 +135,7 @@ ifeq ($(CONFIG_MODULE_SIG),y)
  # duplicates.
  #
  ###############################################################################
@@ -1185,7 +1185,7 @@ index 2c24195..6313698 100644
  X509_CERTIFICATES-y := $(wildcard *.x509) $(wildcard $(srctree)/*.x509)
  X509_CERTIFICATES-$(CONFIG_MODULE_SIG) += signing_key.x509
  X509_CERTIFICATES := $(sort $(foreach CERT,$(X509_CERTIFICATES-y), \
-@@ -169,10 +171,11 @@ $(shell rm $(obj)/.x509.list)
+@@ -150,10 +152,11 @@ $(shell rm $(obj)/.x509.list)
  endif
  endif
  
@@ -1199,7 +1199,7 @@ index 2c24195..6313698 100644
  targets += $(obj)/x509_certificate_list
  $(obj)/x509_certificate_list: $(X509_CERTIFICATES) $(obj)/.x509.list
  	$(call if_changed,x509certs)
-@@ -182,7 +185,9 @@ $(obj)/.x509.list:
+@@ -163,7 +166,9 @@ $(obj)/.x509.list:
  	@echo $(X509_CERTIFICATES) >$@
  
  clean-files := x509_certificate_list .x509.list
@@ -1498,7 +1498,7 @@ index 0000000..51c3514
 1.8.3.1
 
 
-From c0522b3236c27359bd61fee0f0b74be9f8e2ad60 Mon Sep 17 00:00:00 2001
+From 5d862c1ec2e5e033527a5e6ac17042d8d7408f7b Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Fri, 30 Aug 2013 16:07:37 +0100
 Subject: [PATCH 14/18] KEYS: Add a 'trusted' flag and a 'trusted only' flag
@@ -1627,7 +1627,7 @@ index f7cdea2..9b6f6e0 100644
 1.8.3.1
 
 
-From e8e9a6af1d2de6aca01751ccaf0475ed46f9bdb2 Mon Sep 17 00:00:00 2001
+From 6270395cb613c47a5ca459649c4d4ba6eeea2ce4 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Wed, 4 Sep 2013 19:28:03 +0100
 Subject: [PATCH 15/18] KEYS: Set the asymmetric-key type default search method
@@ -1671,7 +1671,7 @@ index cf80765..b77eb53 100644
 1.8.3.1
 
 
-From dfb7781ebba28004f95f7af4e039d8b44697c87c Mon Sep 17 00:00:00 2001
+From cf64858d1b141c9c7d3477f686a923eb8908b438 Mon Sep 17 00:00:00 2001
 From: Mimi Zohar <zohar@linux.vnet.ibm.com>
 Date: Tue, 20 Aug 2013 14:36:26 -0400
 Subject: [PATCH 16/18] KEYS: Make the system 'trusted' keyring viewable by
@@ -1716,7 +1716,7 @@ index 5296721..564dd93 100644
 1.8.3.1
 
 
-From 052744b12209e66ede2a04ec31b9bb7ff40bbc9a Mon Sep 17 00:00:00 2001
+From c8bbb1491c7be6193f502e4d1326f2bd23263616 Mon Sep 17 00:00:00 2001
 From: Mimi Zohar <zohar@linux.vnet.ibm.com>
 Date: Tue, 20 Aug 2013 14:36:27 -0400
 Subject: [PATCH 17/18] KEYS: verify a certificate is signed by a 'trusted' key
@@ -1852,7 +1852,7 @@ index c1540e8..8761264 100644
 1.8.3.1
 
 
-From 8b39d9a6d9f805f6a2e837bf8b9595f701ea4a1c Mon Sep 17 00:00:00 2001
+From 40faeaee1ca7822dc39d24db4b04e4d6c2feba4d Mon Sep 17 00:00:00 2001
 From: Mimi Zohar <zohar@linux.vnet.ibm.com>
 Date: Wed, 4 Sep 2013 13:26:22 +0100
 Subject: [PATCH 18/18] KEYS: initialize root uid and session keyrings early
diff --git a/sources b/sources
index ac798dda7..69f65b2b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 cc6ee608854e0da4b64f6c1ff8b6398c  linux-3.12.tar.xz
-13fe2af0b5a290661d20e121cf9fe530  patch-3.12-git3.xz
+05d693b6ed484423101e9625af6c9089  patch-3.12-git4.xz