Merge "msm: mdp: Move wfd state signalling into mdp driver"
Conflicts:
	drivers/media/video/msm_wfd/mdp-4-subdev.c
	include/linux/msm_mdp.h
Merge "usb: diag_bridge: Support PID 9079"
msm: subsystem_restart: Ignore SSR requests during system reboot/shutdown

When a system reboot or shutdown is already underway, ignore
SSR errors so that the reboot/shutdown process is uninterrupted.
However, log the SSR request so that we know that the subsystem
behaved unexpectedly.

(cherry picked from commit 3d58c2f7db89ab01f76e7733922408c5a398d465)

Change-Id: I60387a63dcb728e271cf4a512c6546b3d4bce0c3
CRs-Fixed: 416175
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/subsystem_restart.c
gpu: ion: Add ADSP heap

The ADSP heap is intended to be used for post processing
on the dsp. Add the definiton of the heap to allow clients
to have dedicated access

Change-Id: I80040b0cf3311df90970c156aa3329f07fc9a990
CRs-Fixed: 438281
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8064.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960.c
USB: allow match on bInterfaceNumber

From 81df2d594340dcb6d1a02191976be88a1ca8120c upstream.

Some composite USB devices provide multiple interfaces
with different functions, all using "vendor-specific"
for class/subclass/protocol.  Another OS use interface
numbers to match the driver and interface. It seems
these devices are designed with that in mind - using
static interface numbers for the different functions.

This adds support for matching against the
bInterfaceNumber, allowing such devices to be supported
without having to resort to testing against interface
number whitelists and/or blacklists in the probe.

Change-Id: I0f991e507d041bbe12aa87403b9c2e1f0de274c2
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
usb: gadget: Support multiple HSIC transport instances for dun and rmnet

Instead of using integer-based IDs to couple bridge instances to the
corresponding gadget ports, assign transport name strings (passed by
userspace) describing the port instance, and match strings to identify
the correct instance when bridge_open() called. This allows multiple
dun and rmnet ports to be assigned without having dependecy of
one-to-one mapping between gadget port instance and bridge driver
instance.

Change-Id: Ia87bd6e9c72d5e98f47dbc2a1cf0b71b48daa1a8
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
media: dvb: Fix stopping of DVR thread

kernel-thread can be stopped either externally using
kthread_stop or the thread function exits by itself, only
one of the approaches should be used.

When kernel thread-function exits the task is cleaned up,
calling kthread_stop afterwords causes failure.

Change-Id: I3eb36e85fa6a650ebdbf2b34dd2ca434f34f28e6
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
media: dvb: mpq: Fix issue with framing mechanism

The demux driver identifies video frames by searchning for patterns in
the video payload. A pattern can be spread over two separate TS packets,
so the pattern lookup mechanism must take into consideration the possible
prefix sizes. Also, when reporting the written data length, the prefix
size (if used) should be added.
This patch fixes issues with not taking all possible prefix sizes into
consideration, and with not reporting the data length properly when a
prefix is used.

Change-Id: I6f4829e860c2d7518964a456a36418be26a06080
Signed-off-by: Liron Kuch <lkuch@codeaurora.org>

Conflicts:
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
media: dvb: Fix demux output buffer overflow state for secure demux

Buffer overflow is handled by flushing the output buffer and
reporting the overflow event to the user, and all subsequent data
callbacks are discarded until user is notified on the overflow.
When buffer overflow is reported by the secure demux and output buffer
is flushed, next calls to secure demux processing report the buffer
as free for new data, but data callbacks are discarded due to being
in overflow state. This causes write pointers of secure demux to get
out of sync.
This patch separates the flushing of the buffer, and now this occurs
when user is notified on the overflow, so secure demux now discards
data during the overflow state.

Change-Id: I20a0bc33b3261fdd4fa6e1f9a543187c1612cebf
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>

Conflicts:
	drivers/media/dvb/dvb-core/dmxdev.h
USB: ks_bridge: Abort suspend when data is received during unlink

All the submitted URBs are unlinked during suspend.  Abort suspend
if data is received during unlink.  This avoids unnecessary suspend
and resume of remaining interfaces.

CRs-Fixed: 449097
Change-Id: Ia4009775ec29df0222b475581649c3a9f4f1899f
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
USB: ks_bridge: Enable autosuspend only for remote wakeup capable devices

USB core marks a device wakeup capable if it supports remote wakeup.
Check this wakeup capable flag before enabling autosuspend.

CRs-Fixed: 449100
Change-Id: I055bf5801859e4d83782916c71e0245c455becbf
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>