nfc: export header for userspace

* We're not actually pn544, but userspace expects pn544.h
* Since the magic is the same between it and pn547, this should
  be fine for now.

Change-Id: I3e1a6b07de78dbd4705116c9cd1656beaedfd387
nl80211: Correct the usage of command NL80211_CMD_VENDOR

Assign/pass the cur_cmd_info parameter correctly. This fixes a
merge error when open source commit
ad7e718c9b4f717823fd920a0103f7b0fb06183f was pulled into the tree.

CRs-Fixed: 672390
Change-Id: Iaa21a1723709683a6f34b07423b74ef0b6077b68
Signed-off-by: Sunil Dutt <usdutt@codeaurora.org>
Enable NEED_NETDEV for vendor command support.

The Vendor command needs to have the NEED_NETDEV internal flag set
for the corresponding vendor_cmd function to initialize correctly
and call the vendor subcommand specific doit function.

CRs-fixed: 633799
Change-Id: Icc46438dc9467fe0344cb832633c49466e2d20d0
Signed-off-by: Subhani Shaik <subhanis@codeaurora.org>
nl80211: nl80211hdr_put() doesn't return an ERR_PTR

There are a few places which check nl80211hdr_put() for an ERR_PTR
but actually it returns NULL on error and never error values.  In
nl80211_testmode_dump() the return wasn't checked at all so I have
added one.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[some whitespace changes]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: cb35fba360dfc3496e5d8a47e23ec5ccdfd90925
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[akholaif@codeaurora.org: resolved conflicts manually]
Change-Id: I5da1aafea35110a1ce606d402b1b96859d34b869
Signed-off-by: Ahmad Kholaif <akholaif@codeaurora.org>
nl80211: fix error path in nl80211_get_key()

Coverity pointed out that in the (practically impossible)
error case we leak the message - fix this.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 9fe271af7d4de96471c5aaee2f4d0d1576050497
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I78c3631eabd04e86872faf65fa1e401dadb35a75
Signed-off-by: Ahmad Kholaif <akholaif@codeaurora.org>
Merge "nfc: export header for userspace" into cm-12.0
msm: mdss: Allow smp change during composition switch

The composition fallback mechanism might not ensure unsetting of
the pipe whose prepare call failed due to smp configuration change,
typically in the cases where change in composition requests same
pipe. This scenario is a deadlock where composition switch does
not happen, due to these pipe failures.

To handle such cases, for changed SMP request for a pipe doing
non backend composition, allow smp configuration to happen, so
that the composition could be successfully switched, thereby
preventing the deadlock.

Conflicts:
	drivers/video/msm/mdss/mdss_mdp_pipe.c

Change-Id: I2d29ac6591671494abc7c4caf7c6c53f058d12f6
Signed-off-by: Justin Philip <jphili@codeaurora.org>
mdss: Add MDP_SMP_FORCE_ALLOC mdp flag

MDP_SMP_FORCE_ALLOC flag is used to allow SMP
allocations even when there is mismatch between
allocated and requested SMPs for a pipe.
User space can make use of this flag in extreme scenarios
where SMP allocations need to pass like GPU composition
and playback of protected  or secure videos.

Change-Id: I369b4361e7e2bbfc8150add467678c4ef8d5cfb6
Signed-off-by: Justin Philip <jphili@codeaurora.org>
dts: msm8974pro-lge-panel: Oversharpening fix

Change-Id: Ibe413fa4227d48b9f35d8f88e6202c7e02ebd283
defconfig: introduce d850 defconfig

Change-Id: I4608f69fb2dc4cdbfaa1802680a3ddb7c6874907
HACK: Workaround for broken camera driver

 * VENUS_BUFFER_SIZE is inlined all over userspace, including in the
   camera driver. The camera driver is ancient, and referenced the
   old calculation which does not include the 8K of padding for
   extradata.
 * Return zero here, so the padding is not included across userspace.
   This will fix the camera, but break several new video features.

 * This issue is a STOPSHIP and must be resolved before final release.

Change-Id: I9e02bd606ececafa13edcf476a261ef7ad39a710
Merge "dts: msm8974pro-lge-panel: Oversharpening fix" into cm-12.0
Merge "HACK: Workaround for broken camera driver" into cm-12.0
prima: update to D855 L release

* from package: LGD855_L_V20a_Kernel

Change-Id: Ia8c8846142b57e7b15fbe0fe41719d9bd48e3492
prima: enable TDLS by default

Change-Id: Ic72cacec2d44053c04cea2641c4da72c7ff9bf32
[PATCH] netlink: add signed types

Signed types might be needed in NL communication from time to time
(I need s32 in team driver), so add them.

Change-Id: Icc6c8286a1d55313fcc7993d8b02267fe1ef2bdc
CRs-Fixed: 677858
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
cfg80211: pass station supported channel and oper class info

The information of the peer's supported channels and supported operating
classes are required for the driver to perform TDLS off channel
operations. This commit enhances the function nl80211_(new)set_station
to pass this information of the peer to the driver.

Conflicts:
	include/linux/nl80211.h
	net/wireless/nl80211.c

CRs-fixed: 595620
Change-Id: I1d630deb4cf435e7f72e3a59276d3771c2b03114
Signed-off-by: Naresh Jayaram <njayar@codeaurora.org>
wcnss: Add API to get monotonic boot time

Add CNSS platform driver API to expose monotonic boot time so that
WLAN host driver can get the timestamp.

Change-Id: I722fa42600bf910254ac01a7305bbbaa35dfa83e
CRs-Fixed: 706813
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
BU52031NVX: Add lid events to support the smartcover

Change-Id: I6e26aeb4c26d30d472e59aed571b43f304f30c3a
g3: enable idletimer for netd

Change-Id: I0e959a6e681a89932f19a644a002d03acba87c3f