Merge "sock_diag: Fix out-of-bounds access to sock_diag_handlers[]"
msm: kgsl: Allocate space in ringbuffer for EOF commands

When userspace passes end of frame (EOF) flag, ringbuffer is
inserted with EOF marker commands. Allocate ringbuffer space
for EOF marker commands.

CRs-Fixed: 469807
Change-Id: I7de8d1b81d358a8d8753ac84fbdceddad27bb17d
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
Merge "ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS"
Merge "input: touchscreen: Change the file system permission of synaptic driver"
Merge "msm_fb:hdmi:Video playback failure issue"
input: atmel_mxt_ts: disable/enable IRQ on suspend/resume.

Disable IRQ in suspend and enable IRQ in resume function
to remove the appearance of old touch data after suspend
and to fix the sticky touch problem.

CRs-Fixed: 526552
Change-Id: Ia6e7823a4a5615b2bc5209e8b3425b52827161de
Signed-off-by: Sarada Prasanna Garnayak <c_sgarna@codeaurora.org>
msm: ipc: Return the error codes without modification

The user-space modules perform decisions regarding retransmission etc.
based on the error codes returned by the IPC Router.

So return the error codes as is without any modification to the
user-space.

Change-Id: Ic7012109c446aaeaba74c3a29cffd16c155e7212
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
Merge "msm_fb:hdmi:Video playback failure issue"
Merge "Merge "msm_fb:hdmi:Video playback failure issue""
Merge "msm: ipc: Return the error codes without modification"
Merge "ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS"
Merge "input: touchscreen: Change the file system permission of synaptic driver"
Slim_msm: Wait for reconfig sequence to complete

Wait for current reconfiguration to complete during
reconfigure_now sequnce. Earlier we are not waiting
for reconfiguration done interrupt after sending the
reconfiguration message to the slimus hardware. This
may lead to hardware synchronization issues in lower
slimbus clock frequencies.

In this patch we are waiting for the reconfiguration
done interrupt from slimbus hardware.

CRs-Fixed: 490022
Change-Id: If0126dac9a1ad2d931e9a0e345d19559fe36f67a
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
usb: gadget: Register RMNET SMD control channel only on protocol connect

The RMNET USB function driver uses SMD channel for transmitting control
messages to the modem processor. Move the registration of the platform
driver which handle the SMD channel to the stage in which the RMNET
function driver is actually got activated by the host which selected
the configuration which contain the RMNET function driver.

This fix is required to prevent cases in which other protocols, as
MBIM for example, which exists in other USB configuration, may need
the same SMD channel which is occupied by the RMNET, since the RMNET
grab the channel on initialization of the function driver rather than
upon activating it.

CRs-Fixed: 435979
Change-Id: I40667c83ca6ff6402a8d6f69a62f1dc42bd265d0
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
Signed-off-by: Tarun Gupta <tarung@codeaurora.org>
Merge "ASoC: wcd9310: Fix DMIC current leakage after disable"
Merge "ALSA: core: Fix crash by avoiding appl_ptr crossing 32-bit boundary"
msm: hdmi: NUL-terminate spd data

NUL-terminate SPD Vendor name and SPD
Product description data stored in the
control structure of hdmi driver. This
avoids overflows in print messages and info
frames.

Change-Id: Ib3fcf35c6e82af18089ebea213e20b0bc0182661
CRs-Fixed: 520148
Signed-off-by: Manoj Rao <manojraj@codeaurora.org>
Merge "seq_file: Allocate memory using vmalloc when kmalloc failed"
Merge "msm: Make CONFIG_STRICT_MEMORY_RWX even stricter"
Revert "msm: Make CONFIG_STRICT_MEMORY_RWX even stricter"

This reverts commit a9c567fb0f057b09aa8eef9d01a5182c606ffb0b

Change-Id: I68ec00bb5b24466ef591d1d4ef150d2bf96a816d