Commit graph

13160 commits

Author SHA1 Message Date
Linux Build Service Account
50bee17e34 Merge "ARM: dts: msm: Disable max20010 regulator device node for msm8996" 2017-08-29 21:19:33 -07:00
Linux Build Service Account
9217c8a15a Merge "ARM: dts: msm: add coresight support on sdm/a 636" 2017-08-29 21:19:28 -07:00
Linux Build Service Account
7272b66e32 Merge "ARM: dts: msm: Add support for speed-bin 3 for SDM660" 2017-08-29 21:19:26 -07:00
Avaneesh Kumar Dwivedi
0c83540fdd ARM: dts: msm: Add minidump dt support for MSS subsystem on sdm660
This change adds minidump id and imem region entries. Minidump id is
used to find imem offset for subsystem which is populated with base
smem table info for subsystem. While imem region entry points to table
of content in shared mem for any subsystem.

Change-Id: I6c14fd962585039b5e7b6293a5ec872861f6600d
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-08-29 05:31:47 -07:00
Tirupathi Reddy
b5a1a5bac3 ARM: dts: msm: Disable max20010 regulator device node for msm8996
Disable max20010 regulator device node from msm8996 regulators
and conditionally enable it for 8996auto boards using max20010
as VDD_GFX supply.

CRs-Fixed: 2091156
Change-Id: I688f1dac31a7601bde5753e2544d07aabdc3cc7a
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-08-29 01:57:29 -07:00
Linux Build Service Account
0d617edc01 Merge "ARM: dts: qcom: Remove lpm performance index for sdm630" 2017-08-29 01:41:05 -07:00
Linux Build Service Account
a26a92216f Merge "drm/msm: add kconfig for enabling event log" 2017-08-29 01:40:56 -07:00
Odelu Kukatla
831f1a45c5 ARM: dts: msm: Add support for speed-bin 3 for SDM660
Add speed-bin 3 to support the fmax of 1.8 GHz and 1.6 GHz
for perf and power clusters respectively.
And also update the cpufreq table for the same.

Change-Id: Ia3be3f321b53bbbb4c37f5e86e451ca86ec8cdc9
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-08-28 17:02:50 +05:30
Zhiqiang Tu
d90bc47280 ARM: dts: msm: Add virtual platform specific pinctrl dtsi
Add customized pinctrl dtsi for virtual platform.

Change-Id: Id31cae5f3e96c4d816cb39953e0aaed5a783bb19
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-08-28 17:32:17 +08:00
Charan Teja Reddy
4285c6ba49 ARM: dts: msm: add coresight support on sdm/a 636
Remove device tree entries related to turing from coresight on sdm/a 636
target.

Change-Id: I22200dbb670d85d70a54caa61c110fd399b70211
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-08-28 12:30:13 +05:30
Abhinav Kumar
4bc07bbb40 ARM: dts: msm: add sde block lengths on msm8998
Specify the lengths of the register blocks for the sde hardware
on msm8998, needed to support register dumping.

Change-Id: I7f798b8a98cc3a8f919e994e1203d2d7c76687d0
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-26 00:31:39 -07:00
Linux Build Service Account
8aedd70842 Merge "ARM: dts: msm: Add support for msm8996 CV2X boards" 2017-08-26 00:12:27 -07:00
Zhiqiang Tu
4d690088c1 ARM: dts: msm: Disable dynamic ramdump for cnss on virtual platform
On virtual platform, cnss doesn't support dynamic dump.

Change-Id: I1734ed62be7753875efe85ed18beaf382af50654
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-08-25 15:26:59 +08:00
Linux Build Service Account
3fe16bcfc8 Merge "Revert "ARM: dts: msm: Add fastrpc vmid flag for sdm660"" 2017-08-24 14:01:17 -07:00
Gustavo Solaira
f2dfd94620 ARM: dts: msm: Add support for msm8996 CV2X boards
Add support for the msm8996 CV2X board that uses an mdm9650
module as endpoint for CV2X radio functionality. The msm8996
is responsible for running the CV2X application stack and
providing external debug and control access to the system.

Change-Id: I575f565580e8f81f15a9017a97aa064e7f2c6088
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-08-24 11:09:00 -07:00
Linux Build Service Account
9a718be2f4 Merge "ARM: dts: msm: update memlat and mincpu node for sdm636" 2017-08-24 06:14:35 -07:00
Hareesh Gundu
5033797b0e ARM: dts: msm: Add GPU maximum frequency 370Mhz support for SDM636
SDM636 inherits all SDM660 GPU properties, but it will support
GPU max frequency 370Mhz and DDR max frequency 1353Mhz.

Change-Id: I35c4e90a264109d9b490eeac762e79440bd46800
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-08-24 16:58:41 +05:30
Zhiqiang Tu
839374c50c ARM: dts: msm: Update cnss configuration on virtual platform
Config sleep state for wlan bootstrap pin and add fixed regulator
support for wlan_en.

Change-Id: I1fa7ccb98b6667e2f212a658d02a4c2b68da4f89
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-08-24 16:45:27 +08:00
Zhiqiang Tu
9df1d44946 Merge branch 'msm-4.4' into dev/msm-4.4-8996au
Conflicts:
	drivers/iommu/arm-smmu.c
	drivers/media/platform/msm/ais/fd/msm_fd_dev.c
	drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c
	drivers/soc/qcom/glink.c
	include/uapi/linux/msm_ipa.h

Change-Id: Id007a850fa2df09f08c413ffcd447a6532fad83c
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-08-24 16:39:56 +08:00
Tharun Kumar Merugu
619757e2f4 Revert "ARM: dts: msm: Add fastrpc vmid flag for sdm660"
Revert this change to avoid TZ dependency in OTA upgrades.
This reverts commit 46756eb931

Change-Id: I2227d1dfa19fa75ea25d42702a9757043b8d63dd
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-24 13:44:51 +05:30
Santosh Mardi
9fdd421d43 ARM: dts: msm: update memlat and mincpu node for sdm636
In SDM636 target CPU frequency corners are updated this
calls for a change in memlat and mincpu node cpufreq to
DDR mapping.

Change-Id: Ief1bf8c3b177b35e6ad178656c736b68401a1845
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2017-08-24 10:52:54 +05:30
Linux Build Service Account
89999e357a Merge "ARM: dts: msm: Remove cdsp context banks for SDM636" 2017-08-23 20:24:55 -07:00
Linux Build Service Account
5d09858f45 Merge "ARM: dts: msm: Add early mount for vendor and system" 2017-08-23 20:24:51 -07:00
tharun kumar
8646cc397a ARM: dts: msm: Remove cdsp context banks for SDM636
Remove the context banks of cdsp from fastrpc device node
for SDM636

Change-Id: I9a238ad21f253da3c4f707a71009e02e9660ed1b
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-22 22:55:07 -07:00
Jitendra Sharma
f58b8337c2 ARM: dts: msm: Align to published memory map for sdm636
Remove cdsp pil node and corresponding carveout region,
also add 1MB buffer at MBA boundary for sdm636.

Change-Id: I6adb0f2ed37559b91d0b607c729e66142f49e86f
Signed-off-by: Jitendra Sharma <shajit@codeaurora.org>
2017-08-22 22:44:02 -07:00
Srinivas Ramana
3e59abb4d5 ARM: dts: msm: Add device tree support for SDM/A 636
Add the required device tree files to support all the platforms
with SDM636 and SDA636.

Change-Id: Iff673b1626acb2bb83c0b7706b118e24919c3934
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2017-08-22 22:39:32 -07:00
Tirupathi Reddy
1f4af949b0 ARM: dts: msm: Add speed-bin 3 for sdm660
Add speed-bin 3 support in cpr3 driver and device nodes
for sdm660.

CRs-Fixed: 2099889
Change-Id: Ied0da8ea6f9d787d0021716566080c37881b9558
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-08-23 10:26:50 +05:30
Yimin Peng
1ebddfae1d ARM: dts: msm: Add adsprpc on virtual platform
Add support for adsp rpc and fastrpc.

Change-Id: Ifd91586879fd874e888fcbe2304d4e9182d0fb87
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2017-08-22 20:23:04 -07:00
Anthony Mah
b075d93c27 ARM: dts: msm: Add early mount for vendor and system
Create support for early mounting of system and vendor partitions
in the kernel on msm8996 platforms.

Change-Id: I3caf26d3e2a371ccd63a2823fe3e487461a8dd08
Signed-off-by: Anthony Mah <amah@codeaurora.org>
2017-08-22 16:33:42 -07:00
Linux Build Service Account
9e200511bc Merge "ARM: dts: msm: Enable laser sensor on sdm630 MTP" 2017-08-22 04:11:32 -07:00
Linux Build Service Account
cb1c821645 Merge "ARM: dts: msm: Remove configuration of the 2nd ADV7533 chip on ADP Lite" 2017-08-21 12:16:36 -07:00
Yujun Zhang
71348bdb76 ARM: dts: msm: Remove configuration of the 2nd ADV7533 chip on ADP Lite
On APQ8096 ADP Lite board, the secondary ADV7533 bridge chip is
removed and its instance is already disabled in current DTS hence
related sde_kms should also remove it. Otherwise, component master
could not find the component for the display instance and causes
drm driver probe failure.

Change-Id: I0fd694cf33eaf8b29ca86efd2ea105ac565bdba1
CRs-Fixed: 2091671
Signed-off-by: Yujun Zhang <yujunzhang@codeaurora.org>
2017-08-21 18:16:09 +08:00
Linux Build Service Account
468ba7b8f9 Merge "Merge android-4.4@9f764bb (v4.4.80) into msm-4.4" 2017-08-21 00:20:14 -07:00
Linux Build Service Account
ba41092462 Merge "ARM: dts: msm: Add Primary TDM Node for msm8996 Hypervisor" 2017-08-21 00:19:57 -07:00
Linux Build Service Account
025604fd4e Merge "ARM: dts: msm: Update boot option for PCIe on APQ8098" 2017-08-21 00:19:56 -07:00
Linux Build Service Account
42be98d03f Merge "ARM: dts: msm: Enable early camera on msm8996 auto" 2017-08-21 00:19:47 -07:00
Linux Build Service Account
40bd639075 Merge "ARM: dts: msm: add support for QBT1000 on SDM660" 2017-08-21 00:19:45 -07:00
Wei Ding
1cc2028b25 ARM: dts: msm: Enable laser sensor on sdm630 MTP
Add the laser device with the required GPIO and
regulator configuration for sdm630 MTP.

Change-Id: I8800d870c41dfc7a74ab2adcf4f0349af8e5f87d
Signed-off-by: Wei Ding <weiding@codeaurora.org>
2017-08-21 14:28:34 +08:00
Zhiqiang Tu
e915e55097 ARM: dts: msm: Add cnss on virtual platform
Add cnss and it's regulators on virtual platform.

Change-Id: I8edbd9ec36e122486c196295ce594e0ac872e0ee
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-08-21 08:38:22 +08:00
Linux Build Service Account
6187c846cd Merge changes I0236f849,I87b2ac56,Ia7a344e6,I1cace039 into msm-4.4
* changes:
  ARM: dts: msm: Add tp rev property for PM660
  iio: rradc: Update RRADC USBIN scaling
  qpnp: revid: Add support to read TP Rev
  ARM: dts: msm: increase PCIe PHY wakeup delay from L1ss for msm8998
2017-08-20 01:17:43 -07:00
Rama Krishna Phani A
7b165529ec ARM: dts: msm: Update boot option for PCIe on APQ8098
Few PCIe clients does not have option to call for enumeration.
Update boot option for PCIe such that enumeration is done as
part of PCIe RC probe.

Change-Id: I1bb977b7e21c046ee7757ed509762897e2bcdd8d
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-08-17 19:47:12 +05:30
Rama Krishna Phani A
71e8c341e2 ARM: dts: msm: Add tp rev property for PM660
Add tp rev property to expose TP-REV information via
rev-id peripheral.

Change-Id: I0236f84947dbf256f090ea32895904024c1f3fcf
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-08-17 02:22:52 -07:00
Yonghui Zhang
0c7e9f51be ARM: dts: msm: enable SMMU for audio-ion
add iommus for audio-ion

CRs-Fixed: 2085351
Change-Id: Iab04df7f2f0ff8db7f978672806b587cfb121ee4
Signed-off-by: Yonghui Zhang <yonghuiz@codeaurora.org>
2017-08-17 01:46:40 -07:00
Yonghui Zhang
3479164eaa ARM: dts: msm: add TDM pin-ctrl for virtual platform
config the pin for TDM pass through

CRs-Fixed: 2085351
Change-Id: Ifdfebca773e7fd32ecd04c642a24b5eb9d818789
Signed-off-by: Yonghui Zhang <yonghuiz@codeaurora.org>
2017-08-17 01:46:25 -07:00
Yonghui Zhang
278564cfd8 ARM: dts: msm: add i2c_6 for external codec
add i2c_6 for external codec virtual platform

CRs-Fixed: 2085351
Change-Id: I281153f2a296e335c89d118bbb9e65457b8d6393
Signed-off-by: Yonghui Zhang <yonghuiz@codeaurora.org>
2017-08-17 01:46:10 -07:00
Yonghui Zhang
66a0a667f4 ARM: dts: msm: Enable lpass dts over virtual platform
add device node needed for lpass, adsp loader

CRs-Fixed: 2085351
Change-Id: I7d2b21625e92af4fb4a190942d27037c1f6afd67
Signed-off-by: Yonghui Zhang <yonghuiz@codeaurora.org>
2017-08-17 01:45:36 -07:00
Rahul Sharma
11d63e136a ARM: dts: msm: Enable early camera on msm8996 auto
Add device nodes to enable early-cam driver for msm8996
auto platform.

Change-Id: If45934434892910ab931bd5b470a4e950c1884a8
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-08-16 04:18:26 -07:00
Abir Ghosh
4aae5c9982 ARM: dts: msm: add support for QBT1000 on SDM660
Add QBT100 device for SDM660 with necessary clocks and GPIO
configurations. QBT1000 is fingerprint driver to communicate
with fingerprint trustzone app through QSEECOM. It also
receives interrupts from fingerprint sensor.

Change-Id: I64482d2c36c48837f7ccf68cfbe73da466e3f836
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-08-16 00:25:12 -07:00
Cong Tang
36f9ae5611 ARM: dts: msm: Add Primary TDM Node for msm8996 Hypervisor
Add Primary TDM node for hypervisor DTS to fix compile error.

Change-Id: Icf61f3e2c5b7689e062315de30fe1d237b4a200f
Signed-off-by: Cong Tang <congt@codeaurora.org>
2017-08-15 23:56:50 -07:00
Blagovest Kolenichev
899e6b9605 Merge android-4.4@9f764bb (v4.4.80) into msm-4.4
* refs/heads/tmp-9f764bb
  Linux 4.4.80
  ASoC: dpcm: Avoid putting stream state to STOP when FE stream is paused
  scsi: snic: Return error code on memory allocation failure
  scsi: fnic: Avoid sending reset to firmware when another reset is in progress
  HID: ignore Petzl USB headlamp
  ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion
  sh_eth: enable RX descriptor word 0 shift on SH7734
  nvmem: imx-ocotp: Fix wrong register size
  arm64: mm: fix show_pte KERN_CONT fallout
  vfio-pci: Handle error from pci_iomap
  video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap
  perf symbols: Robustify reading of build-id from sysfs
  perf tools: Install tools/lib/traceevent plugins with install-bin
  xfrm: Don't use sk_family for socket policy lookups
  tools lib traceevent: Fix prev/next_prio for deadline tasks
  Btrfs: adjust outstanding_extents counter properly when dio write is split
  usb: gadget: Fix copy/pasted error message
  ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
  ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*
  ARM64: zynqmp: Fix i2c node's compatible string
  ARM64: zynqmp: Fix W=1 dtc 1.4 warnings
  dmaengine: ti-dma-crossbar: Add some 'of_node_put()' in error path.
  dmaengine: ioatdma: workaround SKX ioatdma version
  dmaengine: ioatdma: Add Skylake PCI Dev ID
  openrisc: Add _text symbol to fix ksym build error
  irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND
  ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL
  spi: dw: Make debugfs name unique between instances
  ASoC: tlv320aic3x: Mark the RESET register as volatile
  irqchip/keystone: Fix "scheduling while atomic" on rt
  vfio-pci: use 32-bit comparisons for register address for gcc-4.5
  drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set
  drm/msm: Ensure that the hardware write pointer is valid
  net/mlx4: Remove BUG_ON from ICM allocation routine
  ipv6: Should use consistent conditional judgement for ip6 fragment between __ip6_append_data and ip6_finish_output
  ARM: dts: n900: Mark eMMC slot with no-sdio and no-sd flags
  r8169: add support for RTL8168 series add-on card.
  x86/mce/AMD: Make the init code more robust
  tpm: Replace device number bitmap with IDR
  tpm: fix a kernel memory leak in tpm-sysfs.c
  xen/blkback: don't use xen_blkif_get() in xen-blkback kthread
  xen/blkback: don't free be structure too early
  sched/cputime: Fix prev steal time accouting during CPU hotplug
  net: skb_needs_check() accepts CHECKSUM_NONE for tx
  pstore: Use dynamic spinlock initializer
  pstore: Correctly initialize spinlock and flags
  pstore: Allow prz to control need for locking
  vlan: Propagate MAC address to VLANs
  /proc/iomem: only expose physical resource addresses to privileged users
  Make file credentials available to the seqfile interfaces
  v4l: s5c73m3: fix negation operator
  dentry name snapshots
  ipmi/watchdog: fix watchdog timeout set on reboot
  libnvdimm, btt: fix btt_rw_page not returning errors
  RDMA/uverbs: Fix the check for port number
  PM / Domains: defer dev_pm_domain_set() until genpd->attach_dev succeeds if present
  sched/cgroup: Move sched_online_group() back into css_online() to fix crash
  kaweth: fix oops upon failed memory allocation
  kaweth: fix firmware download
  mpt3sas: Don't overreach ioc->reply_post[] during initialization
  mailbox: handle empty message in tx_tick
  mailbox: skip complete wait event if timer expired
  mailbox: always wait in mbox_send_message for blocking Tx mode
  wil6210: fix deadlock when using fw_no_recovery option
  ath10k: fix null deref on wmi-tlv when trying spectral scan
  isdn/i4l: fix buffer overflow
  isdn: Fix a sleep-in-atomic bug
  net: phy: Do not perform software reset for Generic PHY
  nfc: fdp: fix NULL pointer dereference
  xfs: don't BUG() on mixed direct and mapped I/O
  perf intel-pt: Ensure never to set 'last_ip' when packet 'count' is zero
  perf intel-pt: Use FUP always when scanning for an IP
  perf intel-pt: Fix last_ip usage
  perf intel-pt: Fix ip compression
  drm: rcar-du: Simplify and fix probe error handling
  drm: rcar-du: Perform initialization/cleanup at probe/remove time
  drm/rcar: Nuke preclose hook
  Staging: comedi: comedi_fops: Avoid orphaned proc entry
  Revert "powerpc/numa: Fix percpu allocations to be NUMA aware"
  KVM: PPC: Book3S HV: Save/restore host values of debug registers
  KVM: PPC: Book3S HV: Reload HTM registers explicitly
  KVM: PPC: Book3S HV: Restore critical SPRs to host values on guest exit
  KVM: PPC: Book3S HV: Context-switch EBB registers properly
  drm/nouveau/bar/gf100: fix access to upper half of BAR2
  drm/vmwgfx: Fix gcc-7.1.1 warning
  md/raid5: add thread_group worker async_tx_issue_pending_all
  crypto: authencesn - Fix digest_null crash
  powerpc/pseries: Fix of_node_put() underflow during reconfig remove
  net: reduce skb_warn_bad_offload() noise
  pstore: Make spinlock per zone instead of global
  af_key: Add lock to key dump
  ANDROID: binder: Don't BUG_ON(!spin_is_locked()).
  Linux 4.4.79
  alarmtimer: don't rate limit one-shot timers
  tracing: Fix kmemleak in instance_rmdir
  spmi: Include OF based modalias in device uevent
  of: device: Export of_device_{get_modalias, uvent_modalias} to modules
  drm/mst: Avoid processing partially received up/down message transactions
  drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
  drm/mst: Fix error handling during MST sideband message reception
  RDMA/core: Initialize port_num in qp_attr
  ceph: fix race in concurrent readdir
  staging: rtl8188eu: add TL-WN722N v2 support
  Revert "perf/core: Drop kernel samples even though :u is specified"
  perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
  target: Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce
  udf: Fix deadlock between writeback and udf_setsize()
  NFS: only invalidate dentrys that are clearly invalid.
  Input: i8042 - fix crash at boot time
  MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation error message
  MIPS: Send SIGILL for linked branches in `__compute_return_epc_for_insn'
  MIPS: Rename `sigill_r6' to `sigill_r2r6' in `__compute_return_epc_for_insn'
  MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn'
  MIPS: math-emu: Prevent wrong ISA mode instruction emulation
  MIPS: Fix unaligned PC interpretation in `compute_return_epc'
  MIPS: Actually decode JALX in `__compute_return_epc_for_insn'
  MIPS: Save static registers before sysmips
  MIPS: Fix MIPS I ISA /proc/cpuinfo reporting
  x86/ioapic: Pass the correct data to unmask_ioapic_irq()
  x86/acpi: Prevent out of bound access caused by broken ACPI tables
  MIPS: Negate error syscall return in trace
  MIPS: Fix mips_atomic_set() with EVA
  MIPS: Fix mips_atomic_set() retry condition
  ftrace: Fix uninitialized variable in match_records()
  vfio: New external user group/file match
  vfio: Fix group release deadlock
  f2fs: Don't clear SGID when inheriting ACLs
  ipmi:ssif: Add missing unlock in error branch
  ipmi: use rcu lock around call to intf->handlers->sender()
  drm/radeon: Fix eDP for single-display iMac10,1 (v2)
  drm/radeon/ci: disable mclk switching for high refresh rates (v2)
  drm/amd/amdgpu: Return error if initiating read out of range on vram
  s390/syscalls: Fix out of bounds arguments access
  Raid5 should update rdev->sectors after reshape
  cx88: Fix regression in initial video standard setting
  x86/xen: allow userspace access during hypercalls
  md: don't use flush_signals in userspace processes
  usb: renesas_usbhs: gadget: disable all eps when the driver stops
  usb: renesas_usbhs: fix usbhsc_resume() for !USBHSF_RUNTIME_PWCTRL
  USB: cdc-acm: add device-id for quirky printer
  usb: storage: return on error to avoid a null pointer dereference
  xhci: Fix NULL pointer dereference when cleaning up streams for removed host
  xhci: fix 20000ms port resume timeout
  ipvs: SNAT packet replies only for NATed connections
  PCI/PM: Restore the status of PCI devices across hibernation
  af_key: Fix sadb_x_ipsecrequest parsing
  powerpc/asm: Mark cr0 as clobbered in mftb()
  powerpc: Fix emulation of mfocrf in emulate_step()
  powerpc: Fix emulation of mcrf in emulate_step()
  powerpc/64: Fix atomic64_inc_not_zero() to return an int
  iscsi-target: Add login_keys_workaround attribute for non RFC initiators
  scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
  PM / Domains: Fix unsafe iteration over modified list of domain providers
  PM / Domains: Fix unsafe iteration over modified list of device links
  ASoC: compress: Derive substream from stream based on direction
  wlcore: fix 64K page support
  Bluetooth: use constant time memory comparison for secret values
  perf intel-pt: Clear FUP flag on error
  perf intel-pt: Ensure IP is zero when state is INTEL_PT_STATE_NO_IP
  perf intel-pt: Fix missing stack clear
  perf intel-pt: Improve sample timestamp
  perf intel-pt: Move decoder error setting into one condition
  NFC: Add sockaddr length checks before accessing sa_family in bind handlers
  nfc: Fix the sockaddr length sanitization in llcp_sock_connect
  nfc: Ensure presence of required attributes in the activate_target handler
  NFC: nfcmrvl: fix firmware-management initialisation
  NFC: nfcmrvl: use nfc-device for firmware download
  NFC: nfcmrvl: do not use device-managed resources
  NFC: nfcmrvl_uart: add missing tty-device sanity check
  NFC: fix broken device allocation
  ath9k: fix tx99 bus error
  ath9k: fix tx99 use after free
  thermal: cpu_cooling: Avoid accessing potentially freed structures
  s5p-jpeg: don't return a random width/height
  ir-core: fix gcc-7 warning on bool arithmetic
  disable new gcc-7.1.1 warnings for now
  sched/fair: Add a backup_cpu to find_best_target
  sched/fair: Try to estimate possible idle states.
  sched/fair: Sync task util before EAS wakeup
  Revert "sched/fair: ensure utilization signals are synchronized before use"
  sched/fair: kick nohz idle balance for misfit task
  sched/fair: Update signals of nohz cpus if we are going idle
  events: add tracepoint for find_best_target
  sched/fair: streamline find_best_target heuristics
  UPSTREAM: af_key: Fix sadb_x_ipsecrequest parsing
  ANDROID: lowmemorykiller: Add tgid to kill message
  Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE"

Conflicts:
	drivers/gpu/drm/msm/adreno/adreno_gpu.c
	drivers/gpu/drm/msm/msm_ringbuffer.c
	drivers/staging/android/lowmemorykiller.c
	kernel/sched/fair.c

Change-Id: Ic3b3a522b79b1deb178e513b56b9c39eea48e079
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-08-15 09:32:23 -07:00