Merge "msm: kgsl: Add a missing mutex unlock"
Conflicts:
	drivers/gpu/msm/kgsl.c
Merge "msm: display: Do not commit in unset for external."
msm: camera: Notify application in case of bad state.

In case, the bus overflow keeps happening beyond a
predefined threshold, stop recovery and notify the
user about the error so that camera can be gracefully
shutdown.

Change-Id: Iebca9c452137334d99b15910f6aaea063fc8ad69
Signed-off-by: manish gotefode <mgote@codeaurora.org>
diag: Rate limit few error messages

Some diag error messages are printed with high frequency. This
is causing flooding of kernel logs. Rate limiting these messages
will help reading kernel logs.

Change-Id: Ica7c50cabff494f28de685f47d2cf234badb2e85
CRs-fixed: 511430
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
Merge "mmc: core: remove the polling for BKOPS completion"
Merge "msm: camera: ABCC feature porting in kernel space"
tty: n_smux: add separate close notifications

When an SMUX port state is closed, the close request is sent to the
remote system.  The port cannot be re-opened until the remote system
acknowledges the close request.  If the client attempts to re-open the
port during this time, then the -EAGAIN error code is returned and the
client must keep retrying to open the port.  An event-driven approach
would be better, but the client does not receive local state
notifications, so this is not possible.

Add local and remote closed notifications so clients can handle the
closing state transitions without using polling.

CRs-Fixed: 510114
Change-Id: I48008804d23dbfd05df0becd4bc1c695e599a835
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
netfilter: xt_qtaguid: extend iface stat to report protocols

In the past the iface_stat_fmt would only show global bytes/packets
for the skb-based numbers.
For stall detection in userspace, distinguishing tcp vs other protocols
makes it easier.
Now we report
  ifname total_skb_rx_bytes total_skb_rx_packets total_skb_tx_bytes
  total_skb_tx_packets {rx,tx}_{tcp,udp,ohter}_{bytes,packets}

Bug: 6818637

CRs-Fixed: 509089 511633
Change-Id: I06b91826d142fda8444aa6ebe3d0efd6a0a1ce8b
Signed-off-by: JP Abgrall <jpa@google.com>
Git-commit: 01d1733e27c7c03dc700cd8cd7658b326bc0b1b2
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
msm_serial_hs: Increase rx buffer size to 1024bytes

Increase the UARTDM rx buffer size from 512 bytes
to 1024 bytes. This patch helps to increase the
rx data rates of the clients that uses serial_hs driver.

CRs-Fixed: 514385
Change-Id: I2956020af299dda849cfbef795728da2d8664c77
Signed-off-by: Dilip Kota <c_dkota@codeaurora.org>

Conflicts:
	drivers/tty/serial/msm_serial_hs.c
msm: kgsl: Make use of performance counter for A2xx.

Add new performance counter for a2xx to track number
of ALU instructions executed. This will help fault tolerance
detection logic to get more accurate data about the GPU.

Change-Id: I4a1afcfa12fd55a8ca1c4827f1fa7ee8e322e9c5
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>

Conflicts:
	drivers/gpu/msm/adreno.c
tty: n_smux: fix deadlock between RX and TX workers

smux_handle_rx_open_ack function acquires the channel state spin lock
and tries to add the channel into ready list causing spin lock lockup
between smux_rx_worker thread and smux_tx_worker thread running on
two different CPUs.

Add the channel to ready list after releasing the state spin lock.

CRs-Fixed: 514726
Change-Id: I11729290c5c28a13bed66cf7506b8aaf48a32d2a
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
msm: board-8960:  Add chip id support for WRSG 1.1

To support 8960Pro HW version 1.0 & 1.1

Conflicts:
	arch/arm/mach-msm/board-8960.c

Change-Id: I503dd5e52271d4a8b422cc817c59efe289011e4f
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
sync: Limit logging to particular fence on timeout and error

Change-Id: I5bd7d62260666cdd2a32212f0e828d2d5d7d7bba
Signed-off-by: Prakash Kamliya <pkamliya@codeaurora.org>
msm: kgsl: Use no GPU fault tolerance flag passed by UMD driver

Kernel context creation is ignoring "No GPU fault
tolerance" flag passed in by UMD driver. This change forces
kernel to honor "No GPU fault tolerance" flag passed in by
UMD driver and not run GFT on contexts that have this flag set.
Ignoring this flag causes OpenCL to run GFT which is not correct.

CRs-Fixed: 510754
Change-Id: I52b7236d259ec930d07ddae1605e1e683a54d2ba
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

Conflicts:
	drivers/gpu/msm/adreno_drawctxt.c
Merge "msm: kgsl: Fix the extra draw packet on resume for A305"
msm: kgsl: Add a check to free the kgsl_timeline object.

Add a check to free the kgsl_timeline object only after
destroy flag is set. This is to avoid further references to timeline
from kgsl if it is already freed and also to catch any unbalanced
kref count.

Change-Id: I8017b9a928a26b703eb92b17ab6a361e4b479e5a
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
Merge "cfg80211: Allow TDLS peer AID to be configured for VHT"
cfg80211: fix VHT TDLS peer AID verification

I (Johannes) accidentally applied the first version of the patch
("Allow TDLS peer AID to be configured for VHT"). Now apply just
the changes between v1 and v2 to get the AID verification and
prefer the new attribute over the old one.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 3d124ea27ae2fc895f81725f0b4c7f3d9c733df4
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
Change-Id: I72b465fff381f7c3f6faa3731a5c43375887077c
CRs-fixed: 483290
Signed-off-by: Sunil Dutt <duttus@codeaurora.org>
avtimer: kernel driver to expose avtimer to userspace

This driver expose the API to get LPASS subsystem
out of power collapsed state and exposes ioctl control to
read avtimer tick.

Change-Id: I4b50fbfca5741449a8e5f0d0514f5ca7bccec04d
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
msm: Add platform driver entry for avtimer

Register avtimer platform driver

Change-Id: I8211cd7c58845389676c5f96b48c6dd68793890c
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>