Commit graph

47345 commits

Author SHA1 Message Date
codeworkx
15f81a19b5 Merge tag 'LA.UM.7.4.r1-05300-8x98.0' into lineage-16.0
"LA.UM.7.4.r1-05300-8x98.0"

Change-Id: I8e27939efccb7d0bda0ac7c4e32afdf3c6d62507
2019-06-16 08:15:21 +02:00
Linux Build Service Account
10a5c5b618 Merge 96eca37071 on remote branch
Change-Id: Ib1b8db2b2d165effaca8114bd41c8afbec79f437
2019-06-01 22:21:22 -07:00
Venkata Prahlad Valluru
0513453847 ARM: msm: dts: add splash memory region for APQ8098
Add splash region to handle continuous splash over
HDMI.

Change-Id: I827111ce1656fcd4bc3bc61232c2f81af3bef5eb
Signed-off-by: Venkata Prahlad Valluru <vvalluru@codeaurora.org>
2019-05-09 18:17:38 +05:30
codeworkx
6861312cbe Merge tag 'LA.UM.7.4.r1-04700-8x98.0' into auto
"LA.UM.7.4.r1-04700-8x98.0"

Change-Id: I777ab5e199fb463581fbfaf4750c8358d6f9e56f
2019-03-10 16:59:28 +01:00
Shreyas Narayan
a440819fb4 Merge commit '1653208bf47b0d44ebc2ba96f07c639049176669' into HEAD
Change-Id: I9c5823d88f65f85c639d97a74eaf041b24876a0e
Signed-off-by: Shreyas Narayan <shrena@codeaurora.org>
2019-02-01 07:59:12 +05:30
Linux Build Service Account
0ec3a4d049 Merge "ARM: dts: msm: Specify the temperature sensor name for msm8996" 2019-01-14 04:37:24 -08:00
Sunil Khatri
9548b41a99 ARM: dts: msm: Specify the temperature sensor name for msm8996
Specify the name of GPU temperature sensor in the device tree.
This name is used to get the sensor's temperature by querying the
thermal driver API.

CRs-Fixed: 1064728
Change-Id: Ia93d93a442aa848cbd42a5fb8ecad5ef875f9abf
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
Signed-off-by: Archana Sriram <apsrir@codeaurora.org>
2019-01-10 11:50:18 +05:30
Alex Naidis
eaced92da7 DTS: Reduce msm-core polling rate to 100ms
100ms is a better polling rate since the
scheduler's informational demand is lower
than expected.

Change-Id: I5c399155d9bc2469b249bff9e3b9a744b4121429
2018-12-26 08:21:03 +01:00
Alexander Martinz
1e6bd4fc3b arm: dts: properly configure ramoops and reserved memory regions
Get rid of reserved bootloader_log, mtp and param regions, as we do not
use them.

This also removes the need to bump MAX_RESERVED_REGIONS in
  - drivers/of/of_reserved_mem.c

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2018-12-26 08:21:03 +01:00
codeworkx
836593a31c oneplus5: leds: enable rgb sync 2018-12-26 08:21:02 +01:00
Pranav Vashi
652ec5b399 oneplus5: Do not enable verity
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
2018-12-26 08:21:01 +01:00
Swetha Chikkaboraiah
5d63ce78e8 ARM: dts: msm: update dload type imem offset for MSM8998
Dload type imem offset is corrected for MSM8998, so that
correct imem address is updated.

Change-Id: I519603641753ec39d86fbf923bd80afcd6b1345d
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2018-12-26 07:58:27 +01:00
Sahitya Tummala
eef9a048b6 defconfig: msm: Disable EXT2 and EXT3 FS configs for MSM8998
This is required to fix the VTS test case failures which are failing
as the kernel supports EXT2/EXT3 but the tools mkfs.ext2/mkfs.ext3
doesn't exist anymore.

Change-Id: I46aa9e9a9c7ebac4655f18fda1451bd2cf594a25
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2018-12-26 07:58:27 +01:00
Padmanabhan Komanduru
8dbe0c40bc ARM: dts: msm: update the DSI bit clock for DSI panel on SDM660
Update the DSI bit clock frequencies supported for the NT35597
video mode panel on SDM660 for dynamic bit clock feature.

Change-Id: I597bb43bf8f93aa6d98afff5d5b8973689460b41
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-12-26 07:58:27 +01:00
Padmanabhan Komanduru
423d0998bb ARM: dts: msm: enable dynamic bit clock for SDM660 MTP panel
Add DT properties to enable support for dynamic DSI bit clock
feature on NT35597 dual DSI video mode panel on SDM660.

Change-Id: I9b382a7a79ba546c8f99889a5a14d2733ea8771f
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-12-26 07:58:26 +01:00
Padmanabhan Komanduru
8a2a881b50 ARM: dts: msm: add DT properties for dynamic refresh for SDM660/SDM630
Add the DT properties in DSI controller/PLL nodes/memory nodes which
are needed for supporting dynamic refresh feature for SDM660/SDM630.

Change-Id: Iccfaf219705de28eb4bd721987075eab09b0120f
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-12-26 07:54:00 +01:00
Fei Mao
a430609f8f ARM: dts: msm: remove HOME gpio key for qrd devices
For qrd devices, remove HOME gpio key to fix driver probe issue.

Change-Id: I46ba4ef05c795fced67f2db59a3f5ce183bdeba8
Signed-off-by: Fei Mao <feim1@codeaurora.org>
2018-12-26 07:54:00 +01:00
liochen
8148b9d900 Synchronize codes for OnePlus5 & 5T OxygenOS 9.0.0
kernel device tree source code for OnePlus 5 & 5T P device

Change-Id: I84f40e66833ea1ce30eb1d9a710d6e1529e9e637
2018-12-26 11:02:39 +08:00
Linux Build Service Account
3828b1c330 Merge f2f687dfa1 on remote branch
Change-Id: I89822242cfeeb7ba1f57e01dece5cda71dcfae25
2018-12-23 01:15:58 -08:00
Teng Fei Fan
7f1241f188 ARM: dts: msm: Add initial dts support for SDM455 RCM devices
Add initial device trees for SDM455 RCM devices for both external
and internal codec variant.

Change-Id: Idd6034727acc8b9ef600da421963becf5f2305cd
Signed-off-by: Teng Fei Fan <tengfei@codeaurora.org>
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
Signed-off-by: Tengfei Fan <tengfeif@codeaurora.org>
2018-12-17 02:34:41 -08:00
Linux Build Service Account
ea4b9f527e Merge b253ca5007 on remote branch
Change-Id: I2c966b60c89b3e6178158180d4be3ba124b23cbb
2018-11-30 22:26:42 -08:00
Linux Build Service Account
35166c9424 Merge 36ffd181f1 on remote branch
Change-Id: I30e0c2887386e01bef2d61be2bfddd5bddfe9b28
2018-11-01 22:02:26 -07:00
Swetha Chikkaboraiah
261ec40f48 ARM: dts: msm: update dload type imem offset for MSM8998
Dload type imem offset is corrected for MSM8998, so that
correct imem address is updated.

Change-Id: I519603641753ec39d86fbf923bd80afcd6b1345d
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2018-10-28 21:40:55 -07:00
Sahitya Tummala
9195c4a39f defconfig: msm: Disable EXT2 and EXT3 FS configs for MSM8998
This is required to fix the VTS test case failures which are failing
as the kernel supports EXT2/EXT3 but the tools mkfs.ext2/mkfs.ext3
doesn't exist anymore.

Change-Id: I46aa9e9a9c7ebac4655f18fda1451bd2cf594a25
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2018-10-25 09:33:54 +05:30
Linux Build Service Account
8b48243904 Merge fb9adab2b9 on remote branch
Change-Id: Ibc1581cccafc33f5fa7446c2de1840c8a485adab
2018-10-18 07:35:16 -07:00
Padmanabhan Komanduru
75314b9c3c ARM: dts: msm: update the DSI bit clock for DSI panel on SDM660
Update the DSI bit clock frequencies supported for the NT35597
video mode panel on SDM660 for dynamic bit clock feature.

Change-Id: I597bb43bf8f93aa6d98afff5d5b8973689460b41
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-10-11 20:24:14 -07:00
Padmanabhan Komanduru
fe63bacdfb ARM: dts: msm: enable dynamic bit clock for SDM660 MTP panel
Add DT properties to enable support for dynamic DSI bit clock
feature on NT35597 dual DSI video mode panel on SDM660.

Change-Id: I9b382a7a79ba546c8f99889a5a14d2733ea8771f
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-10-11 20:24:03 -07:00
Padmanabhan Komanduru
1f9d195b19 ARM: dts: msm: add DT properties for dynamic refresh for SDM660/SDM630
Add the DT properties in DSI controller/PLL nodes/memory nodes which
are needed for supporting dynamic refresh feature for SDM660/SDM630.

Change-Id: Iccfaf219705de28eb4bd721987075eab09b0120f
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-10-11 20:23:26 -07:00
Fei Mao
dfeb476fb6 ARM: dts: msm: remove HOME gpio key for qrd devices
For qrd devices, remove HOME gpio key to fix driver probe issue.

Change-Id: I46ba4ef05c795fced67f2db59a3f5ce183bdeba8
Signed-off-by: Fei Mao <feim1@codeaurora.org>
2018-10-09 18:02:48 -07:00
Linux Build Service Account
de955d190d Merge 785510ce71 on remote branch
Change-Id: I443fb398e9c54bd7353a29cf474b5e44e54e69bc
2018-10-03 05:48:17 -07:00
Nirmal Abraham
ec05268f4c ARM: dts: msm: Display changes for SDM455
Disable 'assertive display', 'destination scaler' and
'display port' support for SDM455.

Change-Id: I4de89658a6c5b20c97e9fc0f611aaa81f701a9d7
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
2018-09-24 22:15:05 -07:00
Florian Fainelli
25535b0409 ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y
When CONFIG_ARM_MODULE_PLTS is enabled, the first allocation using the
module space fails, because the module is too big, and then the module
allocation is attempted from vmalloc space. Silence the first allocation
failure in that case by setting __GFP_NOWARN.

Change-Id: I94ed69d0cb42b16f68b08354f6f62dc22851d84a
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Git-commit: 75d24d968af8913f641c612930c96acc5399e427
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2018-09-18 01:57:26 -07:00
Pradosh Das
abce7ac781 Merge commit 'db0b2e84b55dcf35e9fa8c25aa46061c1b1db927' into HEAD
Change-Id: Ie538607f2cdc24cb722105fced4d1a40028efd57
Signed-off-by: Pradosh Das <prados@codeaurora.org>
2018-09-17 16:37:49 +05:30
Teng Fei Fan
203e97867d ARM: dts: msm: add initial dts support for SDM455 CDP devices
Add initial devices trees for SDM455 CDP devices

Change-Id: I33bf922baf1dcd5c214f0be81affba25eab0c70c
Signed-off-by: Teng Fei Fan <tengfei@codeaurora.org>
2018-09-16 22:13:47 -07:00
Teng Fei Fan
dda18951cb ARM: dts: msm: add initial dts support for SDM455 QRD devices
Add initial devices trees for SDM455 QRD devices

Change-Id: I7107029ac33f47f1866d7907ff9086d98c466039
Signed-off-by: Teng Fei Fan <tengfei@codeaurora.org>
2018-09-16 22:13:40 -07:00
Teng Fei Fan
e21205e333 ARM: dts: msm: add initial dts support for SDM455 MTP devices
Add initial device trees for SDM455 MTP devices

Change-Id: I8b8f3038ae435db9ea87c7e6a72d79e82f72806f
Signed-off-by: Teng Fei Fan <tengfei@codeaurora.org>
2018-09-16 19:21:06 -07:00
Linux Build Service Account
1af739995e Merge "dt: msm: gvmq: enable virtual ssr for adsp and wlan" 2018-09-12 11:08:35 -07:00
Venkata Rao Kakani
9160e78b22 dt: msm: gvmq: enable virtual ssr for adsp and wlan
Subsystem notification for adsp and wlan in guest.

Change-Id: I49e3e0a160a2434ba9df8008a5ad5051fbeed194
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
2018-09-12 01:35:05 -07:00
Linux Build Service Account
f69d51cf82 Merge "ARM: dts: msm: Add CPR support for SDM630 speed-bin 3" 2018-09-11 22:43:33 -07:00
Linux Build Service Account
77fa429e17 Merge "ARM: dts: msm: Add support for complete subsystem ramdump for SDM660" 2018-09-11 09:46:29 -07:00
Anirudh Ghayal
eaad7892cc ARM: dts: msm: Add CPR support for SDM630 speed-bin 3
Add the CPR configuration of Speed-bin 3 for the power
and performance cluster of SDM630.

Change-Id: I6bf9a837ae941cf3ad9413da6e44821916acf197
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2018-09-11 07:58:09 -07:00
Naitik Bharadiya
4cad566780 ARM: dts: msm: Add support for complete subsystem ramdump for SDM660
Add support to dump complete ramdump of subsystem from start of first
segment to end of last segment without leaving any hole in between.

Change-Id: I0bcab1d4e04748d3934b7a4d99eec59727c3afb1
Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org>
2018-09-11 15:20:08 +05:30
Linux Build Service Account
26a9949800 Merge "ARM: dts: msm: Invert polarity of PMD_MPP_08 for msm8996 CV2X" 2018-09-08 23:45:03 -07:00
Aditya Mathur
ed79b56e02 ARM: dts: msm: Invert polarity of PMD_MPP_08 for msm8996 CV2X
Invert the polarity of PMD_MPP_08 on msm8996 CV2X
to properly power on and off the external
modem as required.

Change-Id: I56226f4d14a2e21331bacf0a7125dc06bfd91aac
Signed-off-by: Aditya Mathur <aditmath@codeaurora.org>
2018-09-06 17:16:30 -07:00
Linux Build Service Account
c44da670c2 Merge "Merge android-4.4.153 (5e24b4e) into msm-4.4" 2018-09-06 14:14:24 -07:00
Linux Build Service Account
310b852149 Merge 4b34bd7077 on remote branch
Change-Id: I3d89a5d75c8a764e914b3de32288bfccb3fbfbd6
2018-09-01 16:36:43 -07:00
Zhiqiang Tu
c7b794feeb ARM: dts: msm: Add 8GB DDR device tree for msm8996 ivi vplatform
Add a new device tree to support 8GB DDR target for msm8996 IVI
virtual platform.

Change-Id: Ia3be942de1c3064aecc59560743849335e8ff60d
Signed-off-by: Anant Goel <anantg@codeaurora.org>
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-08-30 08:59:41 +08:00
Srinivasarao P
b87d31674a Merge android-4.4.153 (5e24b4e) into msm-4.4
* refs/heads/tmp-5e24b4e
  Linux 4.4.153
  ovl: warn instead of error if d_type is not supported
  ovl: Do d_type check only if work dir creation was successful
  ovl: Ensure upper filesystem supports d_type
  x86/mm: Fix use-after-free of ldt_struct
  x86/mm/pat: Fix L1TF stable backport for CPA
  ANDROID: x86_64_cuttlefish_defconfig: Enable lz4 compression for zram
  UPSTREAM: drivers/block/zram/zram_drv.c: fix bug storing backing_dev
  BACKPORT: zram: introduce zram memory tracking
  BACKPORT: zram: record accessed second
  BACKPORT: zram: mark incompressible page as ZRAM_HUGE
  UPSTREAM: zram: correct flag name of ZRAM_ACCESS
  UPSTREAM: zram: Delete gendisk before cleaning up the request queue
  UPSTREAM: drivers/block/zram/zram_drv.c: make zram_page_end_io() static
  BACKPORT: zram: set BDI_CAP_STABLE_WRITES once
  UPSTREAM: zram: fix null dereference of handle
  UPSTREAM: zram: add config and doc file for writeback feature
  BACKPORT: zram: read page from backing device
  BACKPORT: zram: write incompressible pages to backing device
  BACKPORT: zram: identify asynchronous IO's return value
  BACKPORT: zram: add free space management in backing device
  UPSTREAM: zram: add interface to specif backing device
  UPSTREAM: zram: rename zram_decompress_page to __zram_bvec_read
  UPSTREAM: zram: inline zram_compress
  UPSTREAM: zram: clean up duplicated codes in __zram_bvec_write
  Linux 4.4.152
  reiserfs: fix broken xattr handling (heap corruption, bad retval)
  i2c: imx: Fix race condition in dma read
  PCI: pciehp: Fix use-after-free on unplug
  PCI: Skip MPS logic for Virtual Functions (VFs)
  PCI: hotplug: Don't leak pci_slot on registration failure
  parisc: Remove unnecessary barriers from spinlock.h
  bridge: Propagate vlan add failure to user
  packet: refine ring v3 block size test to hold one frame
  netfilter: conntrack: dccp: treat SYNC/SYNCACK as invalid if no prior state
  xfrm_user: prevent leaking 2 bytes of kernel memory
  parisc: Remove ordered stores from syscall.S
  ext4: fix spectre gadget in ext4_mb_regular_allocator()
  KVM: irqfd: fix race between EPOLLHUP and irq_bypass_register_consumer
  staging: android: ion: check for kref overflow
  tcp: identify cryptic messages as TCP seq # bugs
  net: qca_spi: Fix log level if probe fails
  net: qca_spi: Make sure the QCA7000 reset is triggered
  net: qca_spi: Avoid packet drop during initial sync
  net: usb: rtl8150: demote allmulti message to dev_dbg()
  net/ethernet/freescale/fman: fix cross-build error
  drm/nouveau/gem: off by one bugs in nouveau_gem_pushbuf_reloc_apply()
  tcp: remove DELAYED ACK events in DCTCP
  qlogic: check kstrtoul() for errors
  packet: reset network header if packet shorter than ll reserved space
  ixgbe: Be more careful when modifying MAC filters
  ARM: dts: am3517.dtsi: Disable reference to OMAP3 OTG controller
  ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
  perf llvm-utils: Remove bashism from kernel include fetch script
  bnxt_en: Fix for system hang if request_irq fails
  drm/armada: fix colorkey mode property
  ieee802154: fakelb: switch from BUG_ON() to WARN_ON() on problem
  ieee802154: at86rf230: use __func__ macro for debug messages
  ieee802154: at86rf230: switch from BUG_ON() to WARN_ON() on problem
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume
  netfilter: x_tables: set module owner for icmp(6) matches
  smsc75xx: Add workaround for gigabit link up hardware errata.
  kasan: fix shadow_size calculation error in kasan_module_alloc
  tracing: Use __printf markup to silence compiler
  ARM: imx_v4_v5_defconfig: Select ULPI support
  ARM: imx_v6_v7_defconfig: Select ULPI support
  HID: wacom: Correct touch maximum XY of 2nd-gen Intuos
  m68k: fix "bad page state" oops on ColdFire boot
  bnx2x: Fix receiving tx-timeout in error or recovery state.
  drm/exynos: decon5433: Fix WINCONx reset value
  drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes
  drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes
  md/raid10: fix that replacement cannot complete recovery after reassemble
  dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
  ARM: dts: da850: Fix interrups property for gpio
  selftests/x86/sigreturn/64: Fix spurious failures on AMD CPUs
  perf report powerpc: Fix crash if callchain is empty
  perf test session topology: Fix test on s390
  usb: xhci: increase CRS timeout value
  ARM: dts: am437x: make edt-ft5x06 a wakeup source
  brcmfmac: stop watchdog before detach and free everything
  cxgb4: when disabling dcb set txq dcb priority to 0
  Smack: Mark inode instant in smack_task_to_inode
  ipv6: mcast: fix unsolicited report interval after receiving querys
  locking/lockdep: Do not record IRQ state within lockdep code
  net: davinci_emac: match the mdio device against its compatible if possible
  ARC: Enable machine_desc->init_per_cpu for !CONFIG_SMP
  net: propagate dev_get_valid_name return code
  net: hamradio: use eth_broadcast_addr
  enic: initialize enic->rfs_h.lock in enic_probe
  qed: Add sanity check for SIMD fastpath handler.
  arm64: make secondary_start_kernel() notrace
  scsi: xen-scsifront: add error handling for xenbus_printf
  usb: gadget: dwc2: fix memory leak in gadget_init()
  usb: gadget: composite: fix delayed_status race condition when set_interface
  usb: dwc2: fix isoc split in transfer with no data
  ARM: dts: Cygnus: Fix I2C controller interrupt type
  selftests: sync: add config fragment for testing sync framework
  selftests: zram: return Kselftest Skip code for skipped tests
  selftests: user: return Kselftest Skip code for skipped tests
  selftests: static_keys: return Kselftest Skip code for skipped tests
  selftests: pstore: return Kselftest Skip code for skipped tests
  netfilter: ipv6: nf_defrag: reduce struct net memory waste
  ARC: Explicitly add -mmedium-calls to CFLAGS
  ANDROID: x86_64_cuttlefish_defconfig: Enable zram and zstd
  BACKPORT: crypto: zstd - Add zstd support
  UPSTREAM: zram: add zstd to the supported algorithms list
  UPSTREAM: lib: Add zstd modules
  UPSTREAM: lib: Add xxhash module
  UPSTREAM: zram: rework copy of compressor name in comp_algorithm_store()
  UPSTREAM: zram: constify attribute_group structures.
  UPSTREAM: zram: count same page write as page_stored
  UPSTREAM: zram: reduce load operation in page_same_filled
  UPSTREAM: zram: use zram_free_page instead of open-coded
  UPSTREAM: zram: introduce zram data accessor
  UPSTREAM: zram: remove zram_meta structure
  UPSTREAM: zram: use zram_slot_lock instead of raw bit_spin_lock op
  BACKPORT: zram: partial IO refactoring
  BACKPORT: zram: handle multiple pages attached bio's bvec
  UPSTREAM: zram: fix operator precedence to get offset
  BACKPORT: zram: extend zero pages to same element pages
  BACKPORT: zram: remove waitqueue for IO done
  UPSTREAM: zram: remove obsolete sysfs attrs
  UPSTREAM: zram: support BDI_CAP_STABLE_WRITES
  UPSTREAM: zram: revalidate disk under init_lock
  BACKPORT: mm: support anonymous stable page
  UPSTREAM: zram: use __GFP_MOVABLE for memory allocation
  UPSTREAM: zram: drop gfp_t from zcomp_strm_alloc()
  UPSTREAM: zram: add more compression algorithms
  UPSTREAM: zram: delete custom lzo/lz4
  UPSTREAM: zram: cosmetic: cleanup documentation
  UPSTREAM: zram: use crypto api to check alg availability
  BACKPORT: zram: switch to crypto compress API
  UPSTREAM: zram: rename zstrm find-release functions
  UPSTREAM: zram: introduce per-device debug_stat sysfs node
  UPSTREAM: zram: remove max_comp_streams internals
  UPSTREAM: zram: user per-cpu compression streams
  BACKPORT: zsmalloc: require GFP in zs_malloc()
  UPSTREAM: zram/zcomp: do not zero out zcomp private pages
  UPSTREAM: zram: pass gfp from zcomp frontend to backend
  UPSTREAM: socket: close race condition between sock_close() and sockfs_setattr()
  ANDROID: Refresh x86_64_cuttlefish_defconfig
  Linux 4.4.151
  isdn: Disable IIOCDBGVAR
  Bluetooth: avoid killing an already killed socket
  x86/mm: Simplify p[g4um]d_page() macros
  serial: 8250_dw: always set baud rate in dw8250_set_termios
  ACPI / PM: save NVS memory for ASUS 1025C laptop
  ACPI: save NVS memory for Lenovo G50-45
  USB: option: add support for DW5821e
  USB: serial: sierra: fix potential deadlock at close
  ALSA: vxpocket: Fix invalid endian conversions
  ALSA: memalloc: Don't exceed over the requested size
  ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry
  ALSA: cs5535audio: Fix invalid endian conversion
  ALSA: virmidi: Fix too long output trigger loop
  ALSA: vx222: Fix invalid endian conversions
  ALSA: hda - Turn CX8200 into D3 as well upon reboot
  ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs
  net_sched: fix NULL pointer dereference when delete tcindex filter
  vsock: split dwork to avoid reinitializations
  net_sched: Fix missing res info when create new tc_index filter
  llc: use refcount_inc_not_zero() for llc_sap_find()
  l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache
  dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()

Conflicts:
	drivers/block/zram/zram_drv.c
	drivers/staging/android/ion/ion.c
	include/linux/swap.h
	mm/zsmalloc.c

Change-Id: I1c437ac5133503a939d06d51ec778b65371df6d1
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-08-28 17:28:39 +05:30
Linux Build Service Account
b561e50e26 Merge "ARM: dts: msm: Modify subsys notif virtualization on msm8996 vplatform" 2018-08-28 04:02:57 -07:00
Linux Build Service Account
697b92b1d2 Merge "ARM: dts: msm: Add a reset gpio for ethernet on msm8996 CV2X boards" 2018-08-27 18:28:17 -07:00