This repository has been archived by the owner on Dec 28, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'LE.UM.3.2.1-00910-SDX24' into neutrino-msm-fajita-4.9
"LE.UM.3.2.1-00910-SDX24"
* tag 'LE.UM.3.2.1-00910-SDX24':
ANDROID: sched/fair: fix energy compute when a cluster is only a cpu core in multi-cluster system
ANDROID: ion_dummy_driver: Use IS_ERR_OR_NULL() before destroying heaps
ANDROID: ion_dummy_driver: Rework ion_dummy_driver to avoid direct indexing into the heaps
ANDROID: ion_dummy_driver: Remove SYSTEM_CONTIG heap
UPSTREAM: workqueue: make workqueue available early during boot
UPSTREAM: mm: add PageWaiters indicating tasks are waiting for a page bit
UPSTREAM: Avoid page waitqueue race leaving possible page locker waiting
BACKPORT: sched/core: Add wrappers for lockdep_(un)pin_lock()
UPSTREAM: sched/headers: Prepare for new header dependencies before moving code to <linux/sched/loadavg.h>
UPSTREAM: sched/headers, delayacct: Move the 'struct task_delay_info' definition from <linux/sched.h> to <linux/delayacct.h>
UPSTREAM: sched/headers: Move loadavg related definitions from <linux/sched.h> to <linux/sched/loadavg.h>
UPSTREAM: sched/headers: Remove <linux/sched.h> from <linux/sched/loadavg.h>
BACKPORT: cgroup: misc changes
BACKPORT: mm: workingset: tell cache transitions from workingset thrashing
BACKPORT: delayacct: track delays from thrashing cache pages
UPSTREAM: sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD
UPSTREAM: sched: loadavg: make calc_load_n() public
BACKPORT: sched: sched.h: make rq locking and clock functions available in stats.h
BACKPORT: sched: introduce this_rq_lock_irq()
UPSTREAM: psi: pressure stall information for CPU, memory, and IO
BACKPORT: psi: cgroup support
UPSTREAM: kernel/sched/psi.c: simplify cgroup_move_task()
BACKPORT: psi: make disabling/enabling easier for vendor kernels
UPSTREAM: psi: fix reference to kernel commandline enable
UPSTREAM: kernfs: add kernfs_ops->open/release() callbacks
UPSTREAM: kernfs: fix locking around kernfs_ops->release() callback
UPSTREAM: kernfs: Check KERNFS_HAS_RELEASE before calling kernfs_release_file()
UPSTREAM: cgroup add cftype->open/release() callbacks
UPSTREAM: psi: fix aggregation idle shut-off
UPSTREAM: psi: clarify the Kconfig text for the default-disable option
UPSTREAM: psi: avoid divide-by-zero crash inside virtual machines
BACKPORT: fs: kernfs: add poll file operation
BACKPORT: kernel: cgroup: add poll file operation
ANDROID: cuttlefish_defconfig: Enable CONFIG_PSI
FROMLIST: psi: introduce state_mask to represent stalled psi states
FROMLIST: psi: make psi_enable static
FROMLIST: psi: rename psi fields in preparation for psi trigger addition
FROMLIST: psi: split update_stats into parts
FROMLIST: psi: track changed states
FROMLIST: refactor header includes to allow kthread.h inclusion in psi_types.h
FROMLIST: psi: introduce psi monitor
ANDROID: dm-bow: Add dm-bow feature
ANDROID: dm-bow: backport to 4.14
ANDROID: dm-bow: Backport to 4.9
ANDROID: Add dm-bow to cuttlefish configuration
UPSTREAM: binder: create userspace-to-binder-buffer copy function
BACKPORT: binder: add functions to copy to/from binder buffers
BACKPORT: binder: add function to copy binder object from buffer
UPSTREAM: binder: avoid kernel vm_area for buffer fixups
UPSTREAM: binder: remove kernel vm_area for buffer space
BACKPORT: binder: remove user_buffer_offset
UPSTREAM: binder: fix kerneldoc header for struct binder_buffer
BACKPORT: binder: use userspace pointer as base of buffer space
UPSTREAM: binder: fix sparse issue in binder_alloc_selftest.c
UPSTREAM: binder: fix handling of misaligned binder object
UPSTREAM: mm: proc: smaps_rollup: fix pss_locked calculation
ANDROID: fix 4.9 backport of psi header refactoring
ANDROID: dm-bow: Fix 32 bit compile errors
FROMGIT: binder: fix BUG_ON found by selinux-testsuite
UPSTREAM: net: socket: set sock->sk to NULL after calling proto_ops::release()
ANDROID: binder: remove extra declaration left after backport
BACKPORT: filemap: kill page_cache_read usage in filemap_fault
BACKPORT: filemap: drop the mmap_sem for all blocking operations
BACKPORT: filemap: add a comment about FAULT_FLAG_RETRY_NOWAIT behavior
BACKPORT: docs: correct documentation for %pK
BACKPORT: vsprintf: refactor %pK code out of pointer()
UPSTREAM: siphash: add cryptographically secure PRF
UPSTREAM: siphash: implement HalfSipHash1-3 for hash tables
ANDROID: Fix race in crng_reseed()
BACKPORT: printk: hash addresses printed with %p
BACKPORT: vsprintf: add printk specifier %px
UPSTREAM: kasan: use %px to print addresses instead of %p
UPSTREAM: mm/slab.c: do not hash pointers when debugging slab
UPSTREAM: Do not hash userspace addresses in fault handlers
UPSTREAM: usercopy: Remove pointer from overflow report
UPSTREAM: trace_uprobe: Display correct offset in uprobe_events
UPSTREAM: x86/alternative: Print unadorned pointers
UPSTREAM: bug: use %pB in BUG and stack protector failure
BACKPORT: mm/debug.c: provide useful debugging information for VM_BUG
ANDROID: drop CONFIG_INPUT_KEYCHORD from cuttlefish and ranchu
Revert "ANDROID: keychord: Check for write data size"
Revert "ANDROID: keychord: Fix for a memory leak in keychord."
Revert "ANDROID: keychord: Fix races in keychord_write."
Revert "Use %zu to print resid (size_t)."
Revert "ANDROID: keychord: Fix a slab out-of-bounds read."
Revert "ANDROID: input: misc: keychord: log when keychord triggered"
Revert "ANDROID: input: misc: keychord: move header to uapi"
Revert "ANDROID: input: keychord: Add keychord driver"
UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED
ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y
ANDROID: cuttlefish_defconfig: Enable CONFIG_OVERLAY_FS
ANDROID: Makefile: Add '-fsplit-lto-unit' to cfi-clang-flags
Make arm64 serial port config compatible with crosvm
ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
ANDROID: cuttlefish_defconfig: Enable CONFIG_XFRM_STATISTICS
UPSTREAM: usb: separate out sysdev pointer from usb_bus
UPSTREAM: usb: host: ehci: use correct device pointer for dma ops
UPSTREAM: usb: hcd: use correct device pointer for dma ops
ANDROID: cuttlefish 4.9: enable CONFIG_CRYPTO_AES_NI_INTEL=y
ANDROID: Communicates LMK events to userland where they can be logged
ANDROID: cuttlefish_defconfig: Enable CONFIG_CPUSETS and CONFIG_CGROUP_SCHEDTUNE
ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
ANDROID: Move from clang r349610 to r353983c.
ANDROID: cuttlefish_defconfig: Disable DEVTMPFS
UPSTREAM: bpf: relax inode permission check for retrieving bpf program
UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")
msm: ipa3: Fix to validate check for IP type
BACKPORT: kbuild: gcov: enable -fno-tree-loop-im if supported
UPSTREAM: gcov: remove CONFIG_GCOV_FORMAT_AUTODETECT
UPSTREAM: module: add stubs for within_module functions
UPSTREAM: gcov: clang: move common GCC code into gcc_base.c
UPSTREAM: gcov: docs: add a note on GCC vs Clang differences
BACKPORT: gcov: clang support
dwc3: Add ipc debug log for USB GSI and USB endpoint operation
usb: dwc3: debug: Add dbg_log_string to log strings
dwc3-msm: Readback USB GSI wrapper register after updating
dwc3: gadget: Don't queue USB request if pull up is getting disable
dwc3-msm: Log link TRB address and also readback ring doorbell register
usb: dwc3: gadget: Ensure no control transfers in progress when stopping
drm/msm/sde: stage border fill after ctl start timeout
power: smb5: Avoid potential votable deadlock issue
fbdev: msm: check the length of the external input buffer properly
ARM: dts: msm: Add pm660 s6 regulator
ARM: dts: msm: Add dynamic partition support for sdm670 & sdm845
input: touchscreen: cyttsp5: add new touch driver
ARM: dts: msm: Update regulator handles for SDM429w
ARM: dts: msm: Update regulator handles for SDM429w
ARM: dts: msm: Update the pmic rails for SDM429W
defconfig: spyro: Enable haptics and rradc support
ARM: dts: msm: Fix accurate gpio used by Smart PA on Spyro
ARM: dts: msm: Update the regulator limits for APC
ARM: dts: msm: Update regulator handles for SDM429w
arm: dts: msm: Remove pmic revid of pmic for sdm450+pmi632
USB: configfs: Send DISCONNECT uevent during UDC bind
defconfig: remove paranoid network from sdxpoorwills defconfig
ARM: dts: Add pinctl for digit codec on SDM429W
msm: vidc: add additional check to avoid out of bound access
ARM: dts: msm: Add lpm workaround and cpu sleep status for msm8909
soc: qcom: ipc_router_mhi_dev_xprt: Add IPC_RTR export driver for MHI_DEV
defconfig: msm: Enable IPC_RTR over MHI_DEV for SDX24
ARM: dts: msm: Add MHI_DEV IPC router node for sdxpoorwills
ARM: dts: msm: disable ssc-sensors node for sda845 RB3 HW
ARM: dts: msm: Support 16bit vlevel setting from SAW
ARM: dts: correct the spelling error
arm: defconfig: Disable core control for msm8909w
serial: msm_geni_serial: Enhance debug logs and support
ARM: dts: msm: Add DT support for sdxpoorwills v2 pcie mtp
ARM: dts: Add sound support for SDM429W
ARM: dts: msm: EP phy sequence update for sdxpoorwills v2
Defconfig: msm: Enable one kind of regulator framework
diag: Prevent switching mode for non mdlog process
arm: dts: msm: add mss regulator rail for SDM429W
ARM: dts: msm: support external LDO for front camera in spyro
msm: jpeg: Change io dump logic.
msm: vidc: Allow zero length qbuf
diag: dci: Correct out of bounds check in processing dci pkt rsp
ARM: dts: change digital codec supply properties for SDM429w
icnss: Thermal mitigation support in WLAN
msm: adsprpc: Fix integer overflow in refcount of map
soc: qcom: socinfo: Add support for SDM429W soc-id
ARM: dts: msm: add resource manager node for SDM670
ARM: dts: msm: Rename ADP to CCARD for SA415M boards
ARM: dts: msm: enable pronto node for spyro
ARM: dts: msm: adjust LD19A voltage level for sdhc in spyro
ARM: dts: msm: Add support for SA415M CCARD boards
ARM: dts: msm: Enable GPIO_01 for PMX24
soc: qcom: glink_smem: Initialize buffers
qseecom: change to use pr_debug in listener operations
qseecom: fix a blocked listener request issue
mmc: sdhci-msm: Support for getting DLL HSR values from dt file
ARM: dts: msm: disable i2c_5 on Spyro and update PMIC ID
mmc: sdhci-msm: Fix the retention of DLL regs from CX Collapse
mmc: sdhci-msm: Skip PWRSAVE_DLL setting for sdcc minor verion 0x4D
ARM: dt: qcom: Supply dll-hsr settings sdhc on sdm439
ARM: dts: msm: Enable GPIO based keys on Spyro
ARM: dts: msm: sdm429w enable adsp power
ARM: dts: Modify pinctl for digit codec on SDM429W
msm: mhi_dev: Add uevent support to DCI IN/OUT channels
defconfig: msm: Enable the TLV320AIC3X codec for SA415M
ASoC: tlv320aic3x: Add reset inverted DT property
input: touchscreen: cyttsp5: enable new touch driver
ARM: dts: msm: Add sdxpoorwills-v2 definitions for CCARD boards
msm: pcie: Add power on pins for PCI-E client device
Revert "Revert "ARM: dts: msm: Increasing shared mem region size for SDM845 and SDM710""
usb: dwc3: Disable the irq before clearing run_stop bit
ARM: dts: msm: Supply dll-hsr settings for sdhc on SDM429w
defconfig: sdxpoorwills-auto: enable smcinvoke
ASoC: aw8896: add aw8896 SmartPA driver
ARM: dts: support smartPA AW8896 for SDM429w
defconfig: spyro: enable smartPA aw8896 support
usb: dwc3: gadget: Clear pending events when stopping controller
usb: f_gsi: Add error checking for PREPARE_TRBS and STARTXFER ops
usb: dwc3: Fix out of bound memory access for event buffer
usb: dwc3: Disable all interrupts during run_stop clear
usb: dwc3: Fix continuous spurious interrupts
usb: gadget: gsi: Avoid spinlock lockup
usb: gadget: f_gsi: Handle IPA remote wakeup notification properly
usb: gsi: Initialize 'info' with zero
usb: gadget: f_gsi: Fix NULL pointer dereference
dwc3-msm: Remove additional check for link state U3
dwc3: gadget: Fix list corruption issue with dequeue API
usb: dwc3: Do not traverse list using list_for_each_safe
usb: dwc3: Do not initiate remote wakeup from core layer
usb: dwc3-msm: Ensure reset if h/w is out of lpm without any events
usb: f_gsi: Don't enable IPA data path if connect channel fails
ARM: dts: msm: bring up s5k3p9sx04 for spyro device
ARM: dts: msm: add new touch device for Spyro
usb: dwc3: Flush bh work before disabling dwc3_irq
input: touchscreen: cyttsp5: add code copyright
Revert "defconfig: remove paranoid network from sdxpoorwills defconfig"
[@0ctobot: Reapply 63e0afa ("FROMGIT: binder: create node flag to request sender's security context")]
Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>
Conflicts:
Makefile
arch/arm/kernel/irq.c
arch/arm64/boot/dts/qcom/sdm670.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
build.config.cuttlefish.aarch64
build.config.cuttlefish.x86_64
drivers/android/binder.c
drivers/android/binder_alloc.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_ir_led/cam_ir_led_core.c
drivers/media/platform/msm/camera/cam_sensor_module/cam_ir_led/cam_ir_led_dev.c
drivers/media/platform/msm/camera_v2/isp/msm_isp.h
drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
drivers/media/platform/msm/camera_v3/cam_cdm/cam_cdm.h
drivers/media/platform/msm/camera_v3/cam_cdm/cam_cdm_hw_core.c
drivers/media/platform/msm/camera_v3/cam_icp/cam_icp_context.c
drivers/media/platform/msm/camera_v3/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
drivers/media/platform/msm/camera_v3/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_core.c
drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c
drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_soc.h
drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_2_hwreg.h
drivers/mmc/host/sdhci.c
drivers/scsi/sd.c
drivers/staging/android/lowmemorykiller.c
drivers/tty/serial/msm_geni_serial.c
drivers/usb/gadget/function/f_fs.c
fs/ext4/inode.c
fs/f2fs/data.c
fs/kernfs/kernfs-internal.h
include/linux/backing-dev-defs.h
include/linux/cpu.h
include/linux/kernfs.h
include/linux/psi.h
include/linux/psi_types.h
include/linux/sched.h
init/main.c
kernel/cgroup.c
kernel/sched/core.c
kernel/sched/psi.c
mm/backing-dev.c
mm/compaction.c
mm/debug.c
mm/filemap.c
mm/page_alloc.c
mm/vmscan.c
net/core/fib_rules.c
net/ipv4/sysctl_net_ipv4.c- Loading branch information
