This repository has been archived by the owner on Jul 7, 2021. 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 'LV.AU.0.0.1-13310-gen3meta.0' into neutrino/SM8150_Q_10.0
"LV.AU.0.0.1-13310-gen3meta.0"
* tag 'LV.AU.0.0.1-13310-gen3meta.0':
UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED
ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y
ANDROID: cuttlefish_defconfig: Enable CONFIG_OVERLAY_FS
ext4, dax: set ext4_dax_aops for dax files
ext4: switch to fscrypt_file_open()
ext4: switch to fscrypt_prepare_link()
ext4: switch to fscrypt_prepare_rename()
ext4: switch to fscrypt_prepare_setattr()
ANDROID: cuttlefish_defconfig: Enable CONFIG_FUSE_FS
Revert "ANDROID: dm: do_mounts_dm: Update init/do_mounts_dm.c to the latest ChromiumOS version."
Revert "ANDROID: dm: do_mounts_dm: fix dm_substitute_devices()"
Revert "ANDROID: dm: do_mounts_dm: Rebase on top of 4.9"
Revert "CHROMIUM: dm: boot time specification of dm="
drm: increase drm open count to 1024
msm: camera: core : Validate the dev name during the node ioctl handler
msm: ais: resync ais to PC365 camera kernel
fscrypt: add Adiantum support / removed speck
fscrypt: remove CRYPTO_CTR dependency
fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
ext4: use IS_ENCRYPTED() to check encryption status
f2fs: use IS_ENCRYPTED() to check encryption status
fscrypt: remove filesystem specific build config option
ANDROID: Makefile: Properly resolve 4.14.112 merge
Make arm64 serial port config compatible with crosvm
ARM: dts: fix snd card probe error for sa8155 lv
ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
msm: ais: Validate packet params against cpu buffer length
fix blacklist issue
Clean unused files: cam_cdm_hw_core.c/cam_cdm_virtual_core.c/cam_fd_hw_mgr.c/cam_icp_context.c.
ANDROID: cuttlefish_defconfig: Enable CONFIG_XFRM_STATISTICS
ANDROID: cuttlefish_defconfig: Enable CONFIG_CPUSETS and CONFIG_CGROUP_SCHEDTUNE
ANDROID: cuttlefish_defconfig: Enable CONFIG_CPUSETS and CONFIG_CGROUP_SCHEDTUNE
ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
f2fs: Fix use of number of devices
f2fs: Reduce zoned block device memory usage
f2fs: improve discard handling with multi-device volumes
f2fs: fix potential recursive call when enabling data_flush
f2fs: add comment for conditional compilation statement
f2fs: add tracepoint for f2fs_file_write_iter()
f2fs: data: fix warning Using plain integer as NULL pointer
f2fs: fix to avoid deadloop in foreground GC
f2fs: fix error path of recovery
f2fs: fix to retrieve inline xattr space
f2fs: fix to use inline space only if inline_xattr is enable
f2fs: fix to avoid panic in dec_valid_block_count()
f2fs: fix to avoid panic in dec_valid_node_count()
f2fs: fix wrong __is_meta_io() macro
f2fs: remove new blank line of f2fs kernel message
f2fs: fix to clear dirty inode in error path of f2fs_iget()
f2fs: fix to avoid panic in f2fs_remove_inode_page()
f2fs: fix to do checksum even if inode page is uptodate
f2fs: fix to do sanity check on free nid
f2fs: fix to avoid panic in do_recover_data()
f2fs: fix to do sanity check on valid node/block count
f2fs: fix to do sanity check on valid block count of segment
f2fs: fix to avoid panic in f2fs_inplace_write_data()
f2fs: fix to set FI_UPDATE_WRITE correctly
f2fs: mark is_extension_exist() inline
f2fs: introduce f2fs_read_single_page() for cleanup
f2fs: allow address pointer number of dnode aligning to specified size
f2fs: insert space before the open parenthesis '('
f2fs: Replace spaces with tab
f2fs: allow unfixed f2fs_checkpoint.checksum_offset
f2fs: relocate chksum_offset for large_nat_bitmap feature
f2fs: fix to consider multiple device for readonly check
f2fs: fix to skip recovery on readonly device
f2fs: fix to be aware of readonly device in write_checkpoint()
f2fs: remove redundant check in f2fs_file_write_iter()
f2fs: fix to handle error in f2fs_disable_checkpoint()
f2fs: introduce DATA_GENERIC_ENHANCE
f2fs: add tracepoint for f2fs_filemap_fault()
f2fs: fix to avoid potential race on sbi->unusable_block_count access/update
f2fs: fix to avoid accessing xattr across the boundary
ANDROID: Move from clang r349610 to r353983c.
ANDROID: Move from clang r349610 to r353983c.
ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
ANDROID: cuttlefish_defconfig: Disable DEVTMPFS
ANDROID: cuttlefish_defconfig: Disable DEVTMPFS
BACKPORT: fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"
BACKPORT: fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"
UPSTREAM: bpf: relax inode permission check for retrieving bpf program
ANDROID: cuttlefish 4.14: enable CONFIG_CRYPTO_AES_NI_INTEL=y
UPSTREAM: bpf: relax inode permission check for retrieving bpf program
UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")
UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")
fs: sdcardfs: Add missing option to show_options
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
Enable CONFIG_ION_SYSTEM_HEAP
Enable CONFIG_ION_SYSTEM_HEAP
f2fs: link f2fs quota ops for sysfile
Revert "msm: ais: Validate packet params against cpu buffer length"
x86: Hide the int3_emulate_call/jmp functions from UML
x86: Hide the int3_emulate_call/jmp functions from UML
net: sockev: avoid races between sockev and socket_close
msm: kgsl: Fix race condition while making page as dirty
msm: camera : Lock Implementation for avoid race condition
Revert "msm: adsprpc: API to get DSP capability"
Revert "x86/build: Move _etext to actual end of .text"
Revert "x86/build: Move _etext to actual end of .text"
Revert "UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")"
Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied"
Revert "UPSTREAM: fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...")"
Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied"
ANDROID: uid_sys_stats: report uid_cputime stats in microseconds
UPSTREAM: binder: check for overflow when alloc for security context
BACKPORT: Provide in-kernel headers to make extending kernel easier
BACKPORT: kheaders: Move from proc to sysfs
BACKPORT: kheaders: Do not regenerate archive if config is not changed
Revert "binder: fix handling of misaligned binder object"
binder: fix race between munmap() and direct reclaim
UPSTREAM: binder: check for overflow when alloc for security context
BACKPORT: security: Create "kernel hardening" config area
BACKPORT: security: Implement Clang's stack initialization
ANDROID: kernel: cgroup: cpuset: Add missing allocation of cpus_requested in alloc_trial_cpuset
ANDROID: kernel: cgroup: cpuset: Clear cpus_requested for empty buf
BACKPORT: security: Create "kernel hardening" config area
BACKPORT: security: Implement Clang's stack initialization
Dm: init: Enable rootfs mount as dm-verity during boot without ramdisk.
mhi: Don't do memset_io with RXVEC for qcn7605
drm: squash changes for drm lease from upstream
drm/msm-lease: create DRM MSM LEASE driver
Revert "arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable"
Revert "scsi: ufs: Avoid runtime suspend possibly being blocked forever"
soc: qcom: wda: Safe traversal of PS list
ARM: dts: msm: Add icnss node on atoll
UPSTREAM: binder: Set end of SG buffer area properly.
msm: ais: reset software register for each CSID
ANDROID: xfrm: remove in_compat_syscall() checks
mailbox: msm_qmp: Fix aop message failure
ANDROID: cuttlefish_defconfig: enable CONFIG_CPU_FREQ_TIMES
ANDROID: enable CONFIG_RTC_DRV_TEST on cuttlefish
defconfig: msm: disable PM_AUTOSLEEP for sm6150
defconfig: msm: enable CONFIG_USB_RTL8152 for sm6150
defconfig: change BLK_DEV_LOOP_MIN_COUNT's value for SM6150
msm: isp: update the software irq mask
dm: Restore reverted changes
usb: dwc3: Queue sm_work only on sm_usb_wq
msm: kgsl: Update the sequence to resume stalled SMMU
defconfig: msm: remove unnecessary configs for sa8155
msm: kgsl: Remove ADRENO_DEVICE_HARD_RESET flag
msm: kgsl: Improve rGMU firmware loading time
ARM: dts: msm: Add QG profile for ATL466271_3300mAh battery
Revert "net: qrtr: Send HELLO message on endpoint register"
msm: ipa: ADPL over ODL support on MHI Prime channels
msm: ep_pcie: Increase BME timeout
of_batterydata: Add function declarations
of_batterydata: add functions to support SOH based profile loading
power: fg-alg: add support for SOH profile loading
power: qpnp-fg-gen4: add support for SOH based profile loading
msm: ipa: Page recycling on WAN DL data path
phy: msm: qusb: Support reading of efuse value from two regs
msm: ipa: Enable support for dynamic loading of clients
Arm: dts: Add devfreq node for Atoll
ARM: dts: msm: Add video device node SIDs for sdmshrike v2
iommu/io-pgtable-arm: Convert to IOMMU API TLB sync
iommu: arm-smmu: iommu_unmap_fast support
ARM: dts: msm: Add charger, QG and VOL_UP configuration for atoll
ARM: dts: msm: Add thermal zones for SA8195P
ARM: dts: qcom: Add cci, sensor pinctrl gpio for atoll
msm: ipa4: null terminate FST dev name
diag: Initialize peripheral mask properly before log switch
diag: dci: Prevent using uninitialized variables
ARM: dts: msm: Disable IO-Coherent allocation for SDXPRAIRIE
power: smb5-lib: unify wdog timer for SW step-charging
ARM: dts: msm: Add audio support for atoll target
atlantic-forwarding driver v1.0.20
diag: Donot queue read in error case during mhi diag open
net: qualcomm: rmnet: Only update headers for coalesced scenarios
ARM: dts: msm: Add pcie_0 for sa8195 virtual machine
msm: ipa3: Cleanup MHIP Dl rules condition fix
ARM: dts: msm: Add sdcard support for sa8155 vm
msm: ipa3: Change smmu mapping logs to low priority
ARM: dts: msm: Correct USB audio stream iommu SID for atoll
defconfig: Enable PM8008 regulator driver for atoll
power: smb5: Update USBIN allowance only for USBPD charger
ARM: dts: msm: Add ATP platform support for atoll
arm64: arch_timer: Add workaround for ARM erratum 1188873
arm64: cpu_errata: Add ARM erratum 1188873 for Kryo 4G
msm: kgsl: Correctly identify page faulting process
ARM: dts: msm: Add PPI clock sources to bring up v150_110 camera
ARM: dts: msm: Add AHB-IB voting bandwidth to bring up v150_110 camera
dt-bindings: qpnp-fg-gen4: Add ki current threshold properties
power: qpnp-fg-gen4: Add DT support for Ki current thresh coefficients
power: qpnp-fg-gen4: Modify Full SoC Ki coefficients
dt-bindings: qpnp-fg-gen4: Set defaults for {dis}charging Ki coefficients
power: qpnp-fg-gen4: Set default values for {dis}charging Ki coefficients
msm: kgsl: Enable GPU features for SC8180
ARM: dts: qcom: enable audio on QCS404
clk: qcom: gcc-qcs405: Add support for vdd_sr_pll regulator
Revert "ARM: dts: msm: Enable lpm and modify boot option for QCS405"
defconfig: msm: Enable serial console driver for SA2150P perf
defconfig: msm: Enable RNDIS and ECM configs for SA515M
defconfig: msm: Enable CONFIG_DM_BOW for SM6150
ARM: dts: msm: Correct node name of reserved-memory
msm: kgsl: Wait for pending irqs completion in gmu suspend
msm: ipa3: Update channel start as success in flow control state
soc: qcom: hab: Add vmap to fd mode
pinctrl: qcom: Add EGPIO feature support for sdmshrike
msm: ipa: Fix the missing page recycling cleanup on ssr
cnss2: set iova_stop to U64_MAX
msm: kgsl: Fix NULL pointer dereference in gmu_kmem_close()
power: qpnp-qg: Add logic to sanitize SDAM
ARM: dts: msm: add display dt node for atoll target
qcom: minidump: Run minidump initialization asynchronous
msm: npu: Allow sys cache activation failure
power: smb5: handle role-switch failure
pinctrl: qcom: Update direct connect configuration for atoll
ARM: dts: qcom: Add csiphy, cci for atoll
ARM: dts: msm: Include dtsi file for v150_110 camera
ARM: dts: msm: Enable UFS, eMMC and SDcard drivers on ATOLL
power: qpnp-qg: Fix kernel memory corruption error in qg_device_read
ARM: dts: msm: update PCIe0 PHY setting to v1.00 for sdxprairie v2
msm: ipa4: Fix to update aggregation byte limit for coalescing pipe
msm: camera: isp: Added PPI driver functionality
ARM: dts: msm: Change sensor names as per floor plan for sdxprairie
ARM: dts: qcom: Enable phy regulators for atoll
net: aquantia: Zero initialize forward ring descriptors
net: aquantia: Detach SMMU during PCI device removal
net: aquantia: Fix for missing atl_unlock_fw()
defconfig: QCS403: Disable USB diag_bridge, QRTR and RMNET host drivers
ARM: dts: msm: Add touch support for atoll target
Revert "msm: ais: support setting framedrop by io config"
ARM: dts: msm: Add qfprom device node for Atoll
ARM: dts: msm: Update the min voltage of LDO11A for sdmmagpie
ARM: dts: msm: Add camera sensor nodes for atoll
Revert "defconfig: qcs405: enable MHI host stack for qcs405"
staging: android: ion: rate limit warning in ion_sgl_sync_range
ARM: dts: msm: Add support for BT in atoll platform
net: qualcomm: rmnet: segment linear skb with correct size
drivers: iio: imu: Add fix in asm330 driver to support VMAP_STACK
Revert "clk: qcom: gcc-qcs405: Add support for vdd_sr_pll regulator"
ARM: dts: msm: Disable PCIe enumeration on boot for QCS405
msm: ais: fastforward to PC398
defconfig: msm: Disable serial console for QTI Quin GVM perf
ARM: dts: msm: add regulators in Bluetooth node for SA8155VM
dts: sa8195: fix display can't work in DP_MST mode
Fix sa8195p boot panic.
scsi: ufs: sysfs: health descriptor
cnss2: set iova_start and iova_stop to physical RAM range
drm/msm-lease: fix for markings
msm: ais: Remove the active_req_cnt < 2 limitation
Increase stabilize for multiple camera
msm: ais: specify CPU for IFE interrupt
msm: ais: change maximum context numbers to 32
mhi: Don't do memset_io with RXVEC for qcn7605
ais: refine gerrit 2840559 to fix its side effects
Revert "msm: ais: fastforward to PC398"
drm/msm/shd: add dsi_display base in shd_display
drm/msm/sde: change backlight setup to support shared dsi display
Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>
Conflicts:
arch/arm64/boot/dts/qcom/atoll-atp-overlay.dts
arch/arm64/boot/dts/qcom/atoll-atp.dts
arch/arm64/boot/dts/qcom/atoll-atp.dtsi
arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi
arch/arm64/boot/dts/qcom/atoll-audio.dtsi
arch/arm64/boot/dts/qcom/atoll-camera-sensor-idp.dtsi
arch/arm64/boot/dts/qcom/atoll-camera.dtsi
arch/arm64/boot/dts/qcom/atoll-idp.dtsi
arch/arm64/boot/dts/qcom/atoll-pinctrl.dtsi
arch/arm64/boot/dts/qcom/atoll-qrd.dtsi
arch/arm64/boot/dts/qcom/atoll-sde.dtsi
arch/arm64/boot/dts/qcom/atoll.dtsi
arch/arm64/boot/dts/qcom/qg-batterydata-atl466271_3300mAh.dtsi
arch/arm64/include/asm/cpucaps.h
drivers/iommu/arm-smmu.c
drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.h
drivers/misc/uid_sys_stats.c
drivers/net/ethernet/aquantia/atlantic-fwd/atl_common.h
drivers/net/ethernet/aquantia/atlantic-fwd/atl_fw.c
drivers/net/ethernet/aquantia/atlantic-fwd/atl_fw.h
drivers/net/ethernet/aquantia/atlantic-fwd/atl_hw.c
drivers/net/ethernet/aquantia/atlantic-fwd/atl_hw.h
drivers/net/ethernet/aquantia/atlantic-fwd/atl_main.c
drivers/net/ethernet/aquantia/atlantic-fwd/atl_of.h
drivers/net/ethernet/aquantia/atlantic-fwd/atl_ring.c
drivers/net/ethernet/aquantia/atlantic-fwd/release_notes.txt
drivers/net/ethernet/qualcomm/rmnet/rmnet_descriptor.c
drivers/net/wireless/cnss2/pci.c
drivers/oneplus/coretech/coretech_helper.c
drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
drivers/power/supply/qcom/qg-reg.h
drivers/power/supply/qcom/qg-sdam.c
drivers/power/supply/qcom/qg-sdam.h
drivers/power/supply/qcom/smb5-lib.c
drivers/scsi/ufs/ufshcd-pltfrm.c
kernel/cpu.c- Loading branch information
