Merge "Merge "msm: qdsp6v2: Increase max ports in APR""
Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."
Merge "Merge "Merge "msm: qdsp6v2: Increase max ports in APR"""
cfg80211: fix possible circular lock on reg_regdb_search()

When call_crda() is called we kick off a witch hunt search
for the same regulatory domain on our internal regulatory
database and that work gets kicked off on a workqueue, this
is done while the cfg80211_mutex is held. If that workqueue
kicks off it will first lock reg_regdb_search_mutex and
later cfg80211_mutex but to ensure two CPUs will not contend
against cfg80211_mutex the right thing to do is to have the
reg_regdb_search() wait until the cfg80211_mutex is let go.

Change-Id: Ibb44a5325876d77f1549d3938d56d8fbd051b9ba
CRs-Fixed: 655287
Signed-off-by: Santhosh Kumar Padma <skpadma@codeaurora.org>
Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode.""
android/lowmemorykiller: Account for total_swapcache_pages

The lowmemorykiller relies on NR_FILE_PAGES when measureing
the amount of reclaimable memory in the system.
However when swap is enabled swap cache pages are counted
in NR_FILE_PAGES, and swap cache pages aren't as reclaimable
in low memory as file cache pages. Therefore a large swap
cache can result in the lowmemorykiller not running and
an OOM occuring.

In order to ensure the lowmemorykiller properly evaluates the
amount of reclaimable memory don't count the swap cache pages.

Change-Id: I38239283e572f814b277c718eaf6be7f92abacbb
Signed-off-by: Liam Mark <lmark@codeaurora.org>
lowmemorykiller: Account for highmem during kswapd reclaim

Currenlty most memory reclaim is done through kswapd.
Since kswapd uses a gfp mask of GFP_KERNEL, and because
the lowmemorykiller is zone aware, the lowmemorykiller will
ignore highmem most of the time.
This results in the lowmemorykiller being overly aggressive.

The fix to this issue is to allow the lowmemorykiller to
count highmem when being called by the kswapd if the lowmem
watermarks are satisfied.

Change-Id: I938644584f374763d10d429d835e74daa4854a38
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Merge "Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."""
Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode.""
Merge "Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."""
Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode.""
Merge "Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."""
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.37' into cm-11.0

Conflicts:
	arch/arm/mm/dma-mapping.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	net/wireless/nl80211.c

Change-Id: I4228f28bc74631aba13e1da969c91aaefc463195
Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode.""
Merge "Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."""
Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode.""
Merge "Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."""
Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode.""
qseecom: Validate pointer offset in qseecom_send_modfd_cmd

Validate cmd_req_buf pointer offset in qseecom_send_modfy_cmd, and
make sure cmd buffer address to be within shared bufffer.

Signed-off-by: Zhen Kong <zkong@codeaurora.org>

Change-Id: I431511a92ab2cccbc2daebc0cf76cc3872689a97
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Signed-off-by: Vignesh Veeramani <quicvignes@codeaurora.org>
Merge "Merge "Merge "msm: camera: Enable interrupts before returning during Invalid Image mode."""