acpuclock-8930aa: overclock
m4_defconfig: updatez
synaptics_3200: add version with 2ws for M4 and M7 credits to @flar2
ASoC: wcd9304: add a micbias tweak for m4

This gets rid of the dreadful mic noise and makes it usable again.
Taken from the modified m4 driver.

Change-Id: I917e6cadb02efff0271beebd913914b3e4fc59f7
acpuclock-8930aa: adjust OC voltages
n_tty: Fix n_tty_write crash when echoing in raw mode

commit 4291086b1f081b869c6d79e5b7441633dc3ace00 upstream.

The tty atomic_write_lock does not provide an exclusion guarantee for
the tty driver if the termios settings are LECHO & !OPOST.  And since
it is unexpected and not allowed to call TTY buffer helpers like
tty_insert_flip_string concurrently, this may lead to crashes when
concurrect writers call pty_write. In that case the following two
writers:
* the ECHOing from a workqueue and
* pty_write from the process
race and can overflow the corresponding TTY buffer like follows.

If we look into tty_insert_flip_string_fixed_flag, there is:
  int space = __tty_buffer_request_room(port, goal, flags);
  struct tty_buffer *tb = port->buf.tail;
  ...
  memcpy(char_buf_ptr(tb, tb->used), chars, space);
  ...
  tb->used += space;

so the race of the two can result in something like this:
              A                                B
__tty_buffer_request_room
                                  __tty_buffer_request_room
memcpy(buf(tb->used), ...)
tb->used += space;
                                  memcpy(buf(tb->used), ...) ->BOOM

B's memcpy is past the tty_buffer due to the previous A's tb->used
increment.

Since the N_TTY line discipline input processing can output
concurrently with a tty write, obtain the N_TTY ldisc output_lock to
serialize echo output with normal tty writes.  This ensures the tty
buffer helper tty_insert_flip_string is not called concurrently and
everything is fine.

Note that this is nicely reproducible by an ordinary user using
forkpty and some setup around that (raw termios + ECHO). And it is
present in kernels at least after commit
d945cb9cce20ac7143c2de8d88b187f62db99bdc (pty: Rework the pty layer to
use the normal buffering logic) in 2.6.31-rc3.

js: add more info to the commit log
js: switch to bool
js: lock unconditionally
js: lock only the tty->ops->write call

References: CVE-2014-0196
Reported-and-tested-by: Jiri Slaby <jslaby@xxxxxxx>
Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
[bwh: Backported to 3.2: output_lock is a member of struct tty_struct]
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>

Change-Id: Ie00ddace4af1824c5e1ea56c3896896f9aae3092
msm: HTC: fighter: fixup headset PMIC driver init

This addresses issue CYAN-4128.

Change-Id: Ief6e5e9c867d9eda349d5355eaa066af39b93285
msm: HTC: ville: enable 1wire headset support

Change-Id: I813003be4d49b6937d509f183808a19e91861f49
msm: HTC: elite: fixup headset driver init

* provide init and power elements to htc headset mgr driver.
  most notably, this configures gpios for mic bias

* also enable 1wire

Change-Id: Idb3c70ba54375ff75b4cb0767f5426f14aa0ade2
msm: HTC: jet: fixup headset driver init

* provide init and power elements to htc headset mgr driver.
  most notably, this configures gpios for mic bias

* also enable 1wire

Change-Id: I03fa1413cb6d9869ce2779b4886d4c3b65634992
3.4.88 -> 3.4.89
3.4.89 -> 3.4.90
msm: camera: Enable interrupts before returning during Invalid Image
 mode.

Trinity fuzzling test node " /dev/msm_camera/config0 " detected this bug.
Steps to reproduce:
trinity -c ioctl -C 1 --dangerous -V /dev/msm_camera/config0
trinity -c ioctl -C 1 --dangerous -V /dev/msm_camera/config1
block: bfq: bfq-v7r2 -> bfq-v7r3
kernel/power/powersuspend: LCD screen on/off hooks
 (Yank555.lu)

- add an alternative hook for screen on / off detection in the display
  pannel driver
- sleeps  ~0.1s sooner, wakes up ~1s later then autosleep
- clean up source formatting a bit (Paul Reioux)
ville-panel: add powersuspend hooks
ported from here https://github.com/faux123/Nexus_5/commit/22bc5cd1635d998f1b7b102ead036ccfe5dc4611
set intellidemand and noop for default
Set Performance by default