arm: mach-msm: board-htc-8974: import m8whl (Sprint) and w8wl (VZW) variant

Change-Id: Ie92eee3c7bfdf8ccc260b07a6691198885d38ab0

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/board-htc-8974.c
8974: gpiomux: fix for building without KS8851

* ifdef dis shit right here
m8: disable all kernel modules, build in what is needed
Allow normal debuggin of audio subsystem

Conflicts:
	arch/arm/mach-msm/board-glu-audio.c
	sound/soc/msm/qdsp6v2/q6adm.c
synaptics_3k: Add lid events to support the dot case cover
Revert "Revert "kernel: rng: Add IOCTL support to disable bus bandwidth""

This reverts commit 911fb8222bf5f4df424368a27b1c9f513db0a9d2

Change-Id: If9d4d8be7690c2cd7d4fffba084edb7247042dd0

Conflicts:
	include/linux/qrng.h
msm8974: update crypto to kk_3.5, enable QCRYPTO in defconfig

Change-Id: I23259f7cbb9e8aef4ee4a04be68921992a5880b1

Conflicts:
	drivers/crypto/msm/qce.h
	drivers/crypto/msm/qce50.c
	drivers/crypto/msm/qcrypto.c
radio: iris: transport: move radio_hci_smd_init to __init section

Change-Id: I37aba71dc5fdee00054172ed46a20d93c3e77766
radio: iris: fix smd init when iris-transport is not compiled as module

Change-Id: Id0d9a36f93ec387e08be3d041e60113d2cf75aa8

Conflicts:
	drivers/media/radio/radio-iris.c
m8: defconfig: enable Qualcomm IRIS Transport

Change-Id: If227a6644019fa0c61b6179d9e5be3787de2f4e9
Wifi : Switch to 3.2.3.172 revision of pronto driver

Change-Id: Iaa54bb149d7626b69df6cfa8b65fea31f213a4b9
staging: prima: add option to read calibration data from HTC NVS

Change-Id: Ic10b4891eee4071d6edf7aa7bea2b7994f914b2b
Wifi: Enable CONFIG_HTC_WIFI_NVS

Change-Id: Ica017023ea86ca1ee104ba4900bc400c38bbdc41
msm: htc_wifi_nvs: expose wifi calibration data to kernel

Change-Id: Ib21b2a25ee81e312fdccb9a0501e0709353f3541
defconfig: disable perflock

Change-Id: I2dc98a36cee8f04014e04b7ddd1cce11ce6715ae
m8: fix build when disabling CONFIG_HTC_DEBUG_FOOTPRINT

Change-Id: I2908c9505e9c9e37e0dd457f9656ba6106d353a3

Conflicts:
	arch/arm/mach-msm/cpufreq.c
m8: disable a ton of useless htc debug junk

Change-Id: I18639ac291a063e891a489c5bb7afe33060b7a0a
cpufreq: include cpu-boost

Change-Id: I373e25e20370b62fd247d0ecee8b4b28a22e7b2b
futex: Prevent attaching to kernel threads

We happily allow userspace to declare a random kernel thread to be the
owner of a user space PI futex.

Found while analysing the fallout of Dave Jones syscall fuzzer.

We also should validate the thread group for private futexes and find
some fast way to validate whether the "alleged" owner has RW access on
the file which backs the SHM, but that's a separate issue.

Change-Id: Id43144232efa7c3ae7c630cffa69f55ff83d8fd9
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Darren Hart <darren@dvhart.com>
Cc: Davidlohr Bueso <davidlohr@hp.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Clark Williams <williams@redhat.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Roland McGrath <roland@hack.frob.com>
Cc: Carlos ODonell <carlos@redhat.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: http://lkml.kernel.org/r/20140512201701.194824402@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org

Conflicts:
	kernel/futex.c
futex: Add another early deadlock detection check

Dave Jones trinity syscall fuzzer exposed an issue in the deadlock
detection code of rtmutex:
http://lkml.kernel.org/r/20140429151655.GA14277@redhat.com

That underlying issue has been fixed with a patch to the rtmutex code,
but the futex code must not call into rtmutex in that case because
    - it can detect that issue early
    - it avoids a different and more complex fixup for backing out

If the user space variable got manipulated to 0x80000000 which means
no lock holder, but the waiters bit set and an active pi_state in the
kernel is found we can figure out the recursive locking issue by
looking at the pi_state owner. If that is the current task, then we
can safely return -EDEADLK.

The check should have been added in commit 59fa62451 (futex: Handle
futex_pi OWNER_DIED take over correctly) already, but I did not see
the above issue caused by user space manipulation back then.

Change-Id: I038ce8d61ee0d427574939b048035877149a2981
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Darren Hart <darren@dvhart.com>
Cc: Davidlohr Bueso <davidlohr@hp.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Clark Williams <williams@redhat.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Roland McGrath <roland@hack.frob.com>
Cc: Carlos ODonell <carlos@redhat.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: http://lkml.kernel.org/r/20140512201701.097349971@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org

Conflicts:
	kernel/futex.c