Commit graph

594013 commits

Author SHA1 Message Date
Archit Taneja
9d4c3788b4 drm/msm/adreno: Prevent unclocked access when retrieving timestamps
msm_gpu's get_timestamp() op (called by the MSM_GET_PARAM ioctl) can
result in register accesses. We need our power domain and clocks to
be active for that. Make sure they are enabled here.

Change-Id: I1b8e59e0246ed7d9b8a0b6ae660ebfbb15b08782
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-09-07 15:02:36 -06:00
Rob Clark
d223bc2236 drm/msm/gpu: use pm-runtime
We need to use pm-runtime properly when IOMMU is using device_link() to
control it's own clocks.

Change-Id: I7c5668e6a0fcfc2d4664355e49c49d4dcb26323e
Signed-off-by: Rob Clark <robdclark@gmail.com>
Git-commit: eeb754746b140c5f55e6b25706a9142aa549b348
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[ssusheel@codeaurora.org: fix some merge conflicts]
Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org>
2017-09-07 15:02:35 -06:00
Linux Build Service Account
cb8f9c4da7 Merge "power: qpnp-fg-gen3: update SOC masking algorithm" 2017-09-07 11:05:40 -07:00
Gustavo Solaira
1b1517142f ARM: dts: msm: Add FAN cooling device to msm8996 CV2X boards
Add a node for a GPIO-based FAN cooling device for msm8996
CV2X boards. This GPIO has a single speed and can be controlled
from user space.

Change-Id: Iee427407f3c4032e1394c61dd1f225e24a091a99
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-09-07 10:35:31 -07:00
Gustavo Solaira
c283bfe1d5 defconfig: msm: Enable GPIO-based FAN for msm8996-auto
Enable the GPIO FAN driver to enable control of GPIO based
fans for cooling on msm8996-auto devices.

Change-Id: I5494fae1c7ab75362bc6c71c4e731f0581b01995
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-09-07 10:35:23 -07:00
Venkateswara Rao Tadikonda
a33cdc7723 msm: kgsl: Limit the kgsl log frequency in kgsl_get_unmapped_area()
Reduce the frequency of kgsl logging when kgsl driver failed to get
memory mapping for requested memory.

Change-Id: If1a8832a9aa0396e3c990916deec7949697be12d
Signed-off-by: Venkateswara Rao Tadikonda <vtadik@codeaurora.org>
2017-09-07 21:04:46 +05:30
Sunil Khatri
8b6bbeab08 msm: kgsl: Protect the bind object against bad dereference
Sparse bind object are unbinded with bind id. This
can be exploited by any malicious application calling
unbind with same bind id again and again.

This can lead to a race condition between two threads
where one free the bind object and second thread uses
same object leading to bad dereference.

Change-Id: I542a008fc647489560667fb5016453a0c3448f7a
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
2017-09-07 05:18:38 -07:00
Prakash Gupta
d6bb6d333c arm64: stacktrace: avoid listing stacktrace functions in stacktrace
The stacktraces always begin as follows:

 [<c00117b4>] save_stack_trace_tsk+0x0/0x98
 [<c0011870>] save_stack_trace+0x24/0x28
 ...

This is because the stack trace code includes the stack frames for itself.
This is incorrect behaviour, and also leads to "skip" doing the wrong
thing (which is the number of stack frames to avoid recording.)

Perversely, it does the right thing when passed a non-current thread.  Fix
this by ensuring that we have a known constant number of frames above the
main stack trace function, and always skip these.

This was fixed for arch arm by 3683f44c42 ("ARM: stacktrace: avoid
listing stacktrace functions in stacktrace")

Change-Id: I1a65ee011f022227204b406bb0288828a7beb0b8
Link: http://lkml.kernel.org/r/1504078343-28754-1-git-send-email-guptap@codeaurora.org
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Git-commit: 457b9ab50babff7100fe7902d195069561bc1db7
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
[guptap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-09-07 16:14:56 +05:30
Prakash Gupta
bf6d3e63f9 mm, page_owner: skip unnecessary stack_trace entries
The page_owner stacktrace always begin as follows:

[<ffffff987bfd48f4>] save_stack+0x40/0xc8
[<ffffff987bfd4da8>] __set_page_owner+0x3c/0x6c

These two entries do not provide any useful information and limits the
available stacktrace depth.  The page_owner stacktrace was skipping caller
function from stack entries but this was missed with commit f2ca0b557107
("mm/page_owner: use stackdepot to store stacktrace")

Example page_owner entry after the patch:

Page allocated via order 0, mask 0x8(ffffff80085fb714)
PFN 654411 type Movable Block 639 type CMA Flags 0x0(ffffffbe5c7f12c0)
[<ffffff9b64989c14>] post_alloc_hook+0x70/0x80
...
[<ffffff9b651216e8>] msm_comm_try_state+0x5f8/0x14f4
[<ffffff9b6512486c>] msm_vidc_open+0x5e4/0x7d0
[<ffffff9b65113674>] msm_v4l2_open+0xa8/0x224

Change-Id: Ia34fc127d691c2858d991bb631aad9ebc703bcee
Link: http://lkml.kernel.org/r/1504078343-28754-2-git-send-email-guptap@codeaurora.org
Fixes: f2ca0b557107 ("mm/page_owner: use stackdepot to store stacktrace")
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Git-commit: 665bb76dd71bc061c5f730226dc1881d151983c8
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-09-07 15:52:20 +05:30
Veerabhadrarao Badiganti
739a7c1e43 mmc: host: Update the USE_PIO_FOR_EMMC_TUNING quirk value
SDHCI_QUIRK2_USE_PIO_FOR_EMMC_TUNING quirk is defined with a bit position
of 23 (1 << 23). Since this bit position is already defined for some other
quirk, update its bit position to next available one.

Change-Id: I878b3c0b3f4cb32ecaf27fc77ccdfb7d4215a39c
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-09-07 15:22:43 +05:30
Rakesh Pillai
2b8566eb27 ath10k: skip sending default IE in scan request added by firmware
Supported rates and extended supported rates are added in probe
request automatically by firmware. The IE sent by host in the scan
request command is appended to this. If host also sends supported
and extended supported rates IE, then these IEs are duplicated in
the probe requests.

Skip sending the supported rates and extended supported rates IEs
in the start scan command for wcn3990.

CRs-Fixed: 2093804
Change-Id: I9afe85a3602a3935557894ed8c6e1af8cb47967d
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-09-07 14:36:03 +05:30
Linux Build Service Account
aa450b1d93 Merge "drivers: net: can: Add K61 CAN controller driver" 2017-09-07 00:46:05 -07:00
Linux Build Service Account
7edaca927d Merge "diag: Support buffering mode for non-diag_id peripherals" 2017-09-07 00:46:04 -07:00
Linux Build Service Account
329b7b4c99 Merge "lib/stackdepot.c: use __GFP_NOWARN for stack allocations" 2017-09-07 00:46:03 -07:00
Mohammed Javid
bb96b54c01 msm: ipa: Cache CNE event
Provide support to cache CNE event for debugging purpose.

Change-Id: I00d101d3b9a627d7aba3e4524ff301797ea6085e
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-09-07 10:34:59 +05:30
Linux Build Service Account
b864286bdb Merge "diag: Proper Update of the PD packet buffer status and length" 2017-09-06 12:55:56 -07:00
Linux Build Service Account
b42a5cc33b Merge "msm: mdss: Enable clocks for WFD setup" 2017-09-06 12:55:55 -07:00
Linux Build Service Account
02411b451a Merge "msm: sde: Avoid NULL pointer dereference in cancel request" 2017-09-06 12:55:54 -07:00
Linux Build Service Account
120dd65a36 Merge "defconfig: msm: enable Linux Kernel Dump Test Tool" 2017-09-06 12:55:53 -07:00
Linux Build Service Account
aa748b591b Merge "msm: camera: Return -NOTTY on invalid ioctl command." 2017-09-06 12:55:52 -07:00
Linux Build Service Account
bb516d3651 Merge "cnss2: Increase QMI ATHDIAG maximum data size" 2017-09-06 12:55:51 -07:00
Skylar Chang
964eeebd3c msm: ipa: ipa_usb: teth_prot and ttype validation
Add input validation logic for accessing teth_prot and ttype
members.

Change-Id: I05780fb3b09616b7a9cf0c36f71e9f1e5e49f136
CRs-Fixed: 2091803
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-09-06 12:46:37 -07:00
Subbaraman Narayanamurthy
394bb414b7 power: qcom: smb135x: change OTG regulator ops to static
Change the OTG regulator ops to static for smb1351 and smb135x
charger drivers.

Change-Id: Ide0c6461275f3ba74e0420e1d1a36c1e1f2bd18d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-09-06 11:21:26 -07:00
Subbaraman Narayanamurthy
092b095537 power: qpnp-fg-gen3: adjust ki coefficient for full soc dynamically
In certain conditions, after the battery SOC reaches 100%, SOC is
not getting updated during discharging. Based on the hardware
recommendation, adjust the Ki coefficient for full SOC so that
SOC can be updated faster during discharging.

While at it, remove prev_charge_status variable which is not
used really.

CRs-Fixed: 2089555
Change-Id: I54b7d86529c21c016ab777053895ccda9c7a2b35
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-09-06 11:21:26 -07:00
Subbaraman Narayanamurthy
491c46fc13 power: qpnp-fg-gen3: update SOC masking algorithm
Currently, FULL_SOC and MONOTONIC_SOC registers are updated
multiple times when the recharge SOC threshold is close enough to
trigger the recharging frequently. This was leading to a SOC
fluctuation when SOC masking algorithm is enabled.

Rearrange charge_full_update used in SOC masking algorithm such
that FULL_SOC and MONOTONIC_SOC registers are updated just once
when the charge_full flag is cleared.

Also, when the device is rebooted/shutdown and if charge_full
flag is set, write to FULL_SOC with battery_soc and a full value
to MONOTONIC_SOC registers. This helps to maintain the same SOC
across a device reboot.

Change-Id: I95afa90f27e4c0f948f301ff8d6a1f84ae422ef0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-09-06 11:21:25 -07:00
Gustavo Solaira
be06210b35 ARM: dts: msm: Enable CAN controller for msm8996 CV2X boards
Add a device tree node for the SPI CAN controller to enable
a CAN network interface for msm8996 CV2X boards.

Change-Id: Ib9c1d63bf86e3b823aa8d762065ed374bdfeaa0e
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-09-06 10:45:33 -07:00
Gustavo Solaira
79be912c14 defconfig: msm: Enable the K61 CAN driver
Enable configuration for K61 CAN over SPI driver.

Change-Id: I801629ac04303582530bed354282960db8f9c9ab
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-09-06 10:44:54 -07:00
Gustavo Solaira
36d4d74d63 can: k61: Changes to support the mpc5746c controller
Add new parameters to account for different MCUs that can
be used with this driver. These devices have different reset
sequences and number of bits per word supported via SPI. Add
bindings for the mpc5746c controller and make the reset signal
optional.

Change-Id: I616dd3cfedf18a6e21683e1c07551c57c62a675d
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-09-06 10:44:42 -07:00
Abinaya P
4cf8fd54ec drivers: net: can: Add K61 CAN controller driver
This driver creates Network device of type CAN
and processes tx and rx frames that it sends and
receives over SPI protocol.

Change-Id: I54a8665d1b9eda7e9b1ff695bd67de312c410195
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2017-09-06 10:13:38 -07:00
Trishansh Bhardwaj
f80627ce13 msm: camera: Return -NOTTY on invalid ioctl command.
Check validity of command before processing.

Change-Id: Icc5c57eac999b7c40fbb9505b2b88745167adc66
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2017-09-06 01:49:32 -07:00
Linux Build Service Account
b92b0cea6d Merge "ASoC: wsa881x: Fix wsa881x speaker damage" 2017-09-06 01:42:39 -07:00
Laxminath Kasam
faf60ba74f ALSA: info: Protect list access of new entry
At bootup, two different contexts access same list
result in crash. Add mutex lock protect around list access.

CRs-Fixed: 2060390
Change-Id: I648db0a96c507c7e3ad9a5bb7d59021ebf86b27e
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-09-06 00:08:30 -07:00
Manoj Prabhu B
a5464d3b72 diag: Support buffering mode for non-diag_id peripherals
The patch adds the support for buffering mode configuration
for peripherals not supporting diag_id.

CRs-Fixed: 2104591
Change-Id: I2ed34a5141a9b9042dc925c9109d22009b272484
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-09-05 22:45:52 -07:00
Hemant Kumar
bb2db688eb usb: gadget: Update default class subclass and protocol for rndis
This allows Host to load NDIS 6.0 driver for RNDIS over ethernet.
Design objectives of NDIS 6.0 is to enhance driver performance
and scalability. Observing higher peak tput (308Mbps --> 480Mbps)
for FTP transfer on live network. It resolves the data stall that
is being caused by the sudden transfer abort coming from the NDIS
5.0 Host driver.

Change-Id: I503a5573af71eb1b004c68abb64bb04d7e06f9af
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2017-09-05 13:53:39 -07:00
Linux Build Service Account
e91bfdb176 Merge "soc: qcom: ipc_router_glink_xprt: Add wakeup source in RX path" 2017-09-05 13:45:23 -07:00
Yue Ma
04fe10b916 cnss2: Increase QMI ATHDIAG maximum data size
Increase QMI ATHDIAG maximum data size to 6144 bytes so that it
can dump more bytes for debugging.

Change-Id: I21d6197ad67829c38586318d4e76a7c7fd4149c4
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-09-05 10:39:55 -07:00
Kirill A. Shutemov
042adcefd0 lib/stackdepot.c: use __GFP_NOWARN for stack allocations
This (large, atomic) allocation attempt can fail.  We expect and handle
that, so avoid the scary warning.

Change-Id: I3e5d7dbe7d264c2bbeab46db6e0cb8fc9a20e607
Link: http://lkml.kernel.org/r/20160720151905.GB19146@node.shutemov.name
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 87cc271d5e4320d705cfdf59f68d4d037b3511b2
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-09-05 20:16:27 +05:30
Udaya Bhaskara Reddy Mallavarapu
bbacde467c drivers: media: broadcast: Fix security vulnerability issue
Information leak issue is reported in mpq_sdmx_log_level_write
function. Added check to validate count is not zero and initialize
the string.

Change-Id: Ieb2ed88c2d7d778c56be2ec3b9875270a9c74dce
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
2017-09-05 15:05:01 +05:30
Can Guo
aaf56cab21 mmc: core: power off host if SD card resume fails
Current SD card resume function does not handle card
init failure but only prints resume error message.
This change powers off mmc host before exit resume
if card init fails.

Change-Id: Idc27d8ed8769b92373bb9770f5e706b18e76404d
Signed-off-by: Can Guo <cang@codeaurora.org>
2017-09-05 02:27:28 -07:00
Rahul Sharma
e34ed9a339 msm: ais: isp: Check null pointer for VFE0 base
Add NULL pointer check for vfe_base of VFE0.

CRs-Fixed: 1032715
Change-Id: Ie8ed5d14947d9894eb902ea514a1888be98961ef
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-09-05 01:27:17 -07:00
Linux Build Service Account
a9457cb5d5 Merge "qpnp-smb2: provide means to suspend dcin" 2017-09-05 00:20:37 -07:00
Krishna Chaitanya Devarakonda
cd2291139f msm: mdss: Enable clocks for WFD setup
The WFD setup path has few register writes. If the MDP clocks
aren't switched on, the register access might cause SMMU
faults. Turn on the clocks, before calling WFD setup.

Change-Id: Icc865178f43dc6068b6b4b201b8f9eada2570598
Signed-off-by: Krishna Chaitanya Devarakonda <kdevarak@codeaurora.org>
2017-09-04 22:43:23 -07:00
Krishna Chaitanya Devarakonda
f696aed9e7 msm: sde: Avoid NULL pointer dereference in cancel request
There is a race condition possible when two threads are calling
the rotator cancel request. This might result in accessing a pointer
which was already assigned NULL. Fixing this by adding an extra check.

Change-Id: I9ce321a5f033d1fdc9d8b70a04098bfba3d7baaa
Signed-off-by: Krishna Chaitanya Devarakonda <kdevarak@codeaurora.org>
2017-09-04 22:43:21 -07:00
Abhijeet Dharmapurikar
633b5ff609 qpnp-smb2: provide means to suspend dcin
Provide means to suspend the DC path using the power supply
property.

Change-Id: I97f83f5f7c892fc078a92914af0a923b6aacf02e
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-09-04 20:58:03 -07:00
Blagovest Kolenichev
03f50f905f Merge android-4.4@610af85 (v4.4.85) into msm-4.4
* refs/heads/tmp-610af85
  Linux 4.4.85
  ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
  ACPI: ioapic: Clear on-stack resource before using it
  ntb_transport: fix bug calculating num_qps_mw
  ntb_transport: fix qp count bug
  ASoC: rsnd: don't call update callback if it was NULL
  ASoC: rsnd: ssi: 24bit data needs right-aligned settings
  ASoC: rsnd: Add missing initialization of ADG req_rate
  ASoC: rsnd: avoid pointless loop in rsnd_mod_interrupt()
  ASoC: rsnd: disable SRC.out only when stop timing
  ASoC: simple-card: don't fail if sysclk setting is not supported
  staging: rtl8188eu: add RNX-N150NUB support
  iio: hid-sensor-trigger: Fix the race with user space powering up sensors
  iio: imu: adis16480: Fix acceleration scale factor for adis16480
  ANDROID: binder: fix proc->tsk check.
  binder: Use wake up hint for synchronous transactions.
  binder: use group leader instead of open thread
  Bluetooth: bnep: fix possible might sleep error in bnep_session
  Bluetooth: cmtp: fix possible might sleep error in cmtp_session
  Bluetooth: hidp: fix possible might sleep error in hidp_session_thread
  perf/core: Fix group {cpu,task} validation
  nfsd: Limit end of page list when decoding NFSv4 WRITE
  cifs: return ENAMETOOLONG for overlong names in cifs_open()/cifs_lookup()
  cifs: Fix df output for users with quota limits
  tracing: Fix freeing of filter in create_filter() when set_str is false
  drm: rcar-du: Fix H/V sync signal polarity configuration
  drm: rcar-du: Fix display timing controller parameter
  drm: rcar-du: Fix crash in encoder failure error path
  drm: rcar-du: lvds: Rename PLLEN bit to PLLON
  drm: rcar-du: lvds: Fix PLL frequency-related configuration
  drm/atomic: If the atomic check fails, return its value first
  drm: Release driver tracking before making the object available again
  i2c: designware: Fix system suspend
  ARCv2: PAE40: Explicitly set MSB counterpart of SLC region ops addresses
  ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978)
  ALSA: core: Fix unexpected error at replacing user TLV
  Input: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310
  Input: trackpoint - add new trackpoint firmware ID
  mei: me: add lewisburg device ids
  mei: me: add broxton pci device ids
  net_sched: fix order of queue length updates in qdisc_replace()
  net: sched: fix NULL pointer dereference when action calls some targets
  irda: do not leak initialized list.dev to userspace
  tcp: when rearming RTO, if RTO time is in past then fire RTO ASAP
  ipv6: repair fib6 tree in failure case
  ipv6: reset fn->rr_ptr when replacing route
  tipc: fix use-after-free
  sctp: fully initialize the IPv6 address in sctp_v6_to_addr()
  ipv4: better IP_MAX_MTU enforcement
  net_sched/sfq: update hierarchical backlog when drop packet
  ipv4: fix NULL dereference in free_fib_info_rcu()
  dccp: defer ccid_hc_tx_delete() at dismantle time
  dccp: purge write queue in dccp_destroy_sock()
  af_key: do not use GFP_KERNEL in atomic contexts
  ANDROID: NFC: st21nfca: Fix memory OOB and leak issues in connectivity events handler
  Linux 4.4.84
  usb: qmi_wwan: add D-Link DWM-222 device ID
  usb: optimize acpi companion search for usb port devices
  perf/x86: Fix LBR related crashes on Intel Atom
  pids: make task_tgid_nr_ns() safe
  Sanitize 'move_pages()' permission checks
  irqchip/atmel-aic: Fix unbalanced refcount in aic_common_rtc_irq_fixup()
  irqchip/atmel-aic: Fix unbalanced of_node_put() in aic_common_irq_fixup()
  x86/asm/64: Clear AC on NMI entries
  xen: fix bio vec merging
  mm: revert x86_64 and arm64 ELF_ET_DYN_BASE base changes
  mm/mempolicy: fix use after free when calling get_mempolicy
  ALSA: usb-audio: Add mute TLV for playback volumes on C-Media devices
  ALSA: usb-audio: Apply sample rate quirk to Sennheiser headset
  ALSA: seq: 2nd attempt at fixing race creating a queue
  Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB
  Input: elan_i2c - add ELAN0608 to the ACPI table
  crypto: x86/sha1 - Fix reads beyond the number of blocks passed
  parisc: pci memory bar assignment fails with 64bit kernels on dino/cujo
  audit: Fix use after free in audit_remove_watch_rule()
  netfilter: nf_ct_ext: fix possible panic after nf_ct_extend_unregister
  ANDROID: check dir value of xfrm_userpolicy_id
  ANDROID: NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
  ANDROID: nfc: fdp: Fix possible buffer overflow in WCS4000 NFC driver
  ANDROID: NFC: st21nfca: Fix out of bounds kernel access when handling ATR_REQ
  UPSTREAM: usb: dwc3: gadget: don't send extra ZLP
  BACKPORT: usb: dwc3: gadget: handle request->zero
  ANDROID: usb: gadget: assign no-op request complete callbacks
  ANDROID: usb: gadget: configfs: fix null ptr in android_disconnect
  ANDROID: uid_sys_stats: Fix implicit declaration of get_cmdline()
  uid_sys_stats: log task io with a debug flag
  Linux 4.4.83
  pinctrl: samsung: Remove bogus irq_[un]mask from resource management
  pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
  pnfs/blocklayout: require 64-bit sector_t
  iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
  usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
  usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
  usb: core: unlink urbs from the tail of the endpoint's urb_list
  USB: Check for dropped connection before switching to full speed
  uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
  iio: light: tsl2563: use correct event code
  iio: accel: bmc150: Always restore device to normal mode after suspend-resume
  staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
  USB: hcd: Mark secondary HCD as dead if the primary one died
  usb: musb: fix tx fifo flush handling again
  USB: serial: pl2303: add new ATEN device id
  USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
  USB: serial: option: add D-Link DWM-222 device ID
  nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
  fuse: initialize the flock flag in fuse_file on allocation
  iscsi-target: Fix iscsi_np reset hung task during parallel delete
  iscsi-target: fix memory leak in iscsit_setup_text_cmd()
  mm: ratelimit PFNs busy info message
  cpuset: fix a deadlock due to incomplete patching of cpusets_enabled()
  ANDROID: Use sk_uid to replace uid get from socket file
  UPSTREAM: arm64: smp: Prevent raw_smp_processor_id() recursion
  UPSTREAM: arm64: restore get_current() optimisation
  ANDROID: arm64: Fix a copy-paste error in prior init_thread_info build fix

Conflicts:
	drivers/misc/Kconfig
	drivers/usb/dwc3/gadget.c
	include/linux/sched.h
	mm/migrate.c
	net/netfilter/xt_qtaguid.c

Change-Id: I3a0107fcb5c7455114b316426c9d669bb871acd1
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-09-04 17:20:09 -07:00
Linux Build Service Account
d727a95d2e Merge "msm: ipa3: fix compatibility with ipa user space" 2017-09-04 15:01:54 -07:00
Linux Build Service Account
a2e923bd7d Merge "ARM: dts: msm: Add truly panel support for SDM636" 2017-09-04 06:37:56 -07:00
Linux Build Service Account
c607ed2561 Merge "spcom: avoid implicit casting from size_t to uint32 for file ops" 2017-09-04 06:37:55 -07:00
Linux Build Service Account
2cce7b65df Merge "f2fs: Revert duplicate F2FS_MAX_SEGMENT" 2017-09-04 06:37:54 -07:00
Linux Build Service Account
fd43ba03a8 Merge "power: qpnp-fg-gen3: apply SOC linearization based on user input" 2017-09-04 06:37:52 -07:00