Merge "mmc: core : fix arbitrary read/write to user space"
Merge "mmc: core : fix arbitrary read/write to user space"
Merge "defconfig: remove support for /dev/mem and /dev/kmem on perf builds"
Merge "mdp3: Prevent deref of invalid pointer that contains err code"
Merge "mdp3: Wait for proper vsync when updating display frame"
msm: mdss: release mdp dsi clock only when reset

Earlier, we were releasing all the MDP clocks during
lk to kernel transition.   We only need to release
the mdp dsi clock.

Change-Id: Iafa43afc1194e5f7cb50445a9542a21b16ffaef5
Signed-off-by: Xiaoming Zhou <zhoux@codeaurora.org>
Revert "mm: make is_vmalloc_addr work properly."

This reverts commit 0309504dfd29dffec4e88532dc74591fc0fb1290

Change-Id: If7ee7c9451eb71d66cd420fd8990940ef1f19358
Merge "msm: mdss: fix the non-continuous splash screen use case"
Merge "Revert "mm: make is_vmalloc_addr work properly.""
platform: qpnp-power-on: Set boot reason in procfs

Assigns a value to the boot_reason procfs property in
qpnp-power-on. This property can be read via
/proc/sys/kernel/boot_reason. The value for this property
will reflect lowest bit set in the PON_REASON1 PMIC register.
For example, if bit 0 is set in the register, then
boot_reason will have a value of 1. If no bits are set
in the register, then boot_reason will have a value of 0.

For existing PMIC chips, the following mapping applies
for the value of boot_reason:

0 -> unknown
1 -> hard reset
2 -> sudden momentary power loss (SMPL)
3 -> real time clock (RTC)
4 -> DC charger inserted
5 -> USB charger inserted
6 -> PON1 pin toggled (for secondary PMICs)
7 -> CBLPWR_N pin toggled (for external power supply)
8 -> KPDPWR_N pin toggled (power key pressed)

Change-Id: Icf2be66165fd01d3063282fcbfb2b115480e7b5c
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
msm: acpuclock-8974: Update 8974Pro PVS table to config v1

Update 2.5GHz and 2.3GHz RC1 tables to latest voltage plan.

Change-Id: Id31c66eccde28ed7504593928bb45867cdae2b79
Signed-off-by: Junjie Wu <junjiew@codeaurora.org>
ARM: dts: msm: Add NFC device for squab V2 devices

Add nfc nci device to the device tree for squab V2 devices

Change-Id: I809bef2086a950b848823fd4ab6261bd39261d7c
Signed-off-by: Houston Hoffman <hhoffman@codeaurora.org>
ARM: dts: msm: Add a new device tree for msm8926 SKUG PVT

Split a common file of msm8926 QRD SKUG device tree file
to easily add new device tree for msm8926 SKUG PVT.

Change-Id: I3a67da4a6a94ed40bd73a952fb2debf858dd98bf
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
msm: msm_bus: Only set clock rate on unset clocks.

Checks to see if the clock is already set before
requesting a rounded(1) rate.

CRs-Fixed: 568026
Change-Id: I7adbcffd7c86c4e714573aad5bd3813480db2a48
Signed-off-by: Dan Sneddon <dsneddon@codeaurora.org>
msm: usbaudio: Add check for NULL before dereferencing

kzalloc() and usb_ifnum_to_if() both APIs can return NULL. Current
code is not checking return value and derefencing which may crash
device if it is set to NULL. Fix this by checking return value
against NULL and handling the same.

CRs-Fixed: 562273
Change-Id: Idfae0baf5fdedd658a8bb04e5ad95ff5fb4472d1
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Signed-off-by: Saket Saurabh <ssaurabh@codeaurora.org>
msm: mdss: Use MDP_SOLID_FILL to enable color on pipe

To enable constant color on a pipe, set MDP_SOLID_FILL in pipe
flag. This will do a solid fill on the pipe with the color
specified in bg_color.

CRs-Fixed:592032
Change-Id: I3201e2fa657a6fc6d0e7f51f8585366afc3d29a3
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
input: synaptics_i2c_rmi4: Reinitialize list after freeing it

During firmware update and device reset through sysfs, query info
needs to be updated in support_fn_list. However, both these procedures
free the existing list before updation without setting its list head
to consistent state. Reinitialize the list head of support_fn_list
to avoid memory fault during updation.

CRs-Fixed: 589295
Change-Id: I560e2df53d258e273ff9890c7c62b90a58a423f7
Signed-off-by: c_sgarna <c_sgarna@codeaurora.org>
Merge "cfg80211: discard regulatory hints from country IEs with undefined wiphy"
msm: mdp3: implement asynchronous frame events

Asynchronous frame events from MDP allows commit thread to be unblocked
once the frame contents have been flushed to MDP HW and new frame can be
programmed while waiting for DMA transfer to complete.

Change-Id: If2ecc3cedfd92e20b2e98b0ac4f6f3608ce78579
Signed-off-by: Terence Hampson <thampson@codeaurora.org>
Merge "msm: msm_bus: Only set clock rate on unset clocks."