Greg Kroah-Hartman e8f79d9cbb Merge branch 'android12-5.10' into branch 'android12-5.10-lts' ... Sync up with the android12-5.10 branch for the following commit: c4bd1c03ba ANDROID: qcom: Add is_dma_buf_file to ABI 268088c42e ANDROID: GKI: update .xml file a7f3a36529 ANDROID: GKI: enable KFENCE by setting the sample interval to 500ms 9d1c78d623 ANDROID: abi_gki_aarch64_qcom: Add xhci symbols to list 5896d00f9c ANDROID: vmlinux.lds.h: Define SANITIZER_DISCARDS with CONFIG_CFI_CLANG ffacd097fc ANDROID: usb: typec: tcpci: Add vendor hook to mask vbus present 1a93d556d7 ANDROID: usb: typce: tcpci: Add vendor hook for chip specific features 08879ea0d6 ANDROID: usb: typec: tcpci: Add vendor hooks for tcpci interface 892e618852 FROMGIT: f2fs: add sysfs nodes to get runtime compression stat 58f0e25d0d ANDROID: dma-buf: Fix error path on system heaps use of the page pool 958c19b19b ANDROID: usb: typec: tcpm: Fix event storm caused by error in backport 0b6fadd02e ANDROID: GKI: USB: XHCI: add Android ABI padding to lots of xhci structures 6f00446c76 FROMGIT: KVM: arm64: Fix host's ZCR_EL2 restore on nVHE b0671cd753 FROMGIT: KVM: arm64: Force SCTLR_EL2.WXN when running nVHE 8f25c7432f FROMGIT: KVM: arm64: Turn SCTLR_ELx_FLAGS into INIT_SCTLR_EL2_MMU_ON f47a4d91e5 FROMGIT: KVM: arm64: Use INIT_SCTLR_EL2_MMU_OFF to disable the MMU on KVM teardown 3ff7250562 FROMGIT: arm64: Use INIT_SCTLR_EL1_MMU_OFF to disable the MMU on CPU restart a8a9fadaf8 FROMGIT: KVM: arm64: Enable SVE support for nVHE b0e15c8c44 FROMGIT: KVM: arm64: Save/restore SVE state for nVHE 194fd166b5 BACKPORT: FROMGIT: KVM: arm64: Trap host SVE accesses when the FPSIMD state is dirty 507e10616c FROMGIT: KVM: arm64: Save guest's ZCR_EL1 before saving the FPSIMD state 4cb78b26ea FROMGIT: KVM: arm64: Map SVE context at EL2 when available 1105b4d1ce BACKPORT: FROMGIT: KVM: arm64: Rework SVE host-save/guest-restore 57171b3636 FROMGIT: arm64: sve: Provide a conditional update accessor for ZCR_ELx ac5f5708bb FROMGIT: KVM: arm64: Introduce vcpu_sve_vq() helper f9bab75599 FROMGIT: KVM: arm64: Let vcpu_sve_pffr() handle HYP VAs c2469fa4b4 FROMGIT: KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1 f5e060d65e FROMGIT: KVM: arm64: Provide KVM's own save/restore SVE primitives af855ca1c9 ANDROID: GKI: USB: Gadget: add Android ABI padding to struct usb_gadget 24149445ad ANDROID: vendor_hooks: Add hooks for memory when debug 00185a421a ANDROID: vendor_hooks: Add hooks for ufs scheduler b8981993c2 ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint 5a56f5119e ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure 599e75fcfd ANDROID: GKI: timer.h: add Android ABI padding to a structure 303a28f485 ANDROID: GKI: quota.h: add Android ABI padding to some structures a06d91262a ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures 8faaa07702 ANDROID: GKI: mm.h: add Android ABI padding to a structure f21777c57f ANDROID: GKI: kobject.h: add Android ABI padding to some structures 31f6b7a1ae ANDROID: GKI: kernfs.h: add Android ABI padding to some structures 1a517d8668 ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure c6adf0c7b9 ANDROID: GKI: ioport.h: add Android ABI padding to a structure c469de24a1 ANDROID: GKI: iomap.h: add Android ABI padding to a structure 3cb5c28964 ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure eff6517b1e ANDROID: GKI: genhd.h: add Android ABI padding to some structures 9a92773dc8 ANDROID: GKI: ethtool.h: add Android ABI padding to a structure 774168de67 ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure 73ff58b01f ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures f0688df6b5 ANDROID: GKI: blk_types.h: add Android ABI padding to a structure 4a895f1f2b ANDROID: GKI: scsi.h: add Android ABI padding to a structure 48691266ca ANDROID: GKI: pci: add Android ABI padding to some structures 4c95a92b84 ANDROID: GKI: add Android ABI padding to struct nf_conn e6f5502bc3 UPSTREAM: usb: typec: tcpm: Skip sink_cap query only when VDM sm is busy 36547f2f6d FROMGIT: usb: typec: tcpm: PD3.0 sinks can send Discover Identity even in device mode 3f7ada406d UPSTREAM: usb: gadget: configfs: Fix KASAN use-after-free 9bd96584f4 UPSTREAM: usb: typec: Remove vdo[3] part of tps6598x_rx_identity_reg struct f2e7bdcdfa UPSTREAM: usb: dwc3: gadget: Prevent EP queuing while stopping transfers 462c92e8f2 FROMGIT: usb: typec: tcpci: Added few missing TCPCI register definitions 6f85b7e0f8 UPSTREAM: usb: typec: tcpm: Invoke power_supply_changed for tcpm-source-psy- 8cf94785bb Revert "ANDROID: GKI: Enable bounds sanitizer" 0eecc2aa30 ANDROID: GKI: temporarily disable LTO/CFI 3520187422 ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()" 16982b6a18 FROMLIST: KVM: arm64: Disable FWB in host stage-2 3a16a9e7be FROMLIST: KVM: arm64: Introduce KVM_PGTABLE_S2_NOFWB Stage-2 flag bcdcab0253 FROMLIST: KVM: arm64: Protect the .hyp sections from the host 317d5a5030 FROMLIST: KVM: arm64: Disable PMU support in protected mode 6697310c08 FROMLIST: KVM: arm64: Page-align the .hyp sections 68bd98a28a FROMLIST: KVM: arm64: Wrap the host with a stage 2 5a128f0626 FROMLIST: KVM: arm64: Provide sanitized mmfr* registers at EL2 0af83133e3 FROMLIST: KVM: arm64: Add kvm_pgtable_stage2_find_range() c3f49047ca FROMLIST: KVM: arm64: Refactor the *_map_set_prot_attr() helpers 9349978462 FROMLIST: KVM: arm64: Use page-table to track page ownership 845457f549 FROMLIST: KVM: arm64: Always zero invalid PTEs 1d349d64ba FROMLIST: KVM: arm64: Sort the hypervisor memblocks 1e798d4121 FROMLIST: KVM: arm64: Reserve memory for host stage 2 6fddc52e50 FROMLIST: KVM: arm64: Make memcache anonymous in pgtable allocator a20c8e1c48 FROMLIST: KVM: arm64: Refactor __populate_fault_info() 21a1f89953 FROMLIST: KVM: arm64: Refactor __load_guest_stage2() 1a9bba9121 FROMLIST: KVM: arm64: Refactor kvm_arm_setup_stage2() 6d3f5c07aa FROMLIST: KVM: arm64: Set host stage 2 using kvm_nvhe_init_params eef107d42a FROMLIST: KVM: arm64: Use kvm_arch in kvm_s2_mmu 1a76f891e1 FROMLIST: KVM: arm64: Use kvm_arch for stage 2 pgtable d8eb170aa9 FROMLIST: KVM: arm64: Elevate hypervisor mappings creation at EL2 ae1ed8a984 FROMLIST: KVM: arm64: Prepare the creation of s1 mappings at EL2 364f0639db FROMLIST: arm64: asm: Provide set_sctlr_el2 macro ca52b29511 FROMLIST: KVM: arm64: Factor out vector address calculation a1180dd384 FROMLIST: KVM: arm64: Provide __flush_dcache_area at EL2 37b5552dfb FROMLIST: KVM: arm64: Enable access to sanitized CPU features at EL2 75fba96057 FROMLIST: KVM: arm64: Introduce a Hyp buddy page allocator f6e834486a FROMLIST: KVM: arm64: Stub CONFIG_DEBUG_LIST at Hyp 01253f8e2c FROMLIST: KVM: arm64: Introduce an early Hyp page allocator a3aad4cf4a FROMLIST: KVM: arm64: Allow using kvm_nvhe_sym() in hyp code 81181250ba FROMLIST: KVM: arm64: Make kvm_call_hyp() a function call at Hyp 542dace0bc FROMLIST: KVM: arm64: Introduce a BSS section for use at Hyp 4a4beb1005 FROMLIST: KVM: arm64: Factor memory allocation out of pgtable.c 620bb5f9c9 FROMLIST: KVM: arm64: Avoid free_page() in page-table allocator c758e8e4b1 FROMLIST: KVM: arm64: Initialize kvm_nvhe_init_params early ce5e848201 FROMLIST: arm64: kvm: Add standalone ticket spinlock implementation for use at hyp 9833905e2d FROMLIST: KVM: arm64: Link position-independent string routines into .hyp.text 0f63237470 FROMLIST: arm64: lib: Annotate {clear, copy}_page() as position-independent edab6a7245 Revert "ANDROID: sched: cpufreq_schedutil: add sugov tracepoints" 187306ab1a ANDROID: Partial revert of 06881e01b5 ("ANDROID: sched: Add vendor hooks for override sugov behavior") b542f4c389 Revert "ANDROID: sched: Add vendor hooks for skipping sugov update" 27d6dac0df Revert "ANDROID: sched: cpufreq_schedutil: move sugov traces to sched" cc574f0d36 ANDROID: thermal: Add logic for filter on-die tz genl event. 6c6fac8f39 ANDROID: mmc: support hardware that takes key directly e4636b47ef UPSTREAM: zram: fix broken page writeback 542d1937ba UPSTREAM: zram: fix return value on writeback_store 475aea007d ANDROID: sched: Add vendor hook for util_est_update 89ea2f1eca ANDROID: GKI: Enable DTPM framework a3a580961b ANDROID: GKI: Add remoteproc framework symbols to symbol list 53e8099784 ANDROID: vendor_hooks: Add hooks for scheduler 7e2c33ac0e FROMGIT: configfs: fix a use-after-free in __configfs_open_file 7656aa0f48 ANDROID: lib/plist.c: Export plist-related APIs 4d63efb9ae ANDROID: module: Add vendor hook 2ff446fc4d ANDROID: bpf: Add vendor hook dccee128b7 ANDROID: kernel: Add vendor hook in creds 0a3b407463 ANDROID: security: selinux: Add vendor hook in avc a128ec2b2e UPSTREAM: KVM: arm64: Fix exclusive limit for IPA size ac821b6257 UPSTREAM: KVM: arm64: Reject VM creation when the default IPA size is unsupported d2eb8b0028 ANDROID: GKI: add android_kabi.h 45021f7679 UPSTREAM: MAINTAINERS: add entry for KFENCE 90d03f6fcf ANDROID: Clang LTO: Comment on symbol visibility workaround 169ddec367 FROMLIST: mm: fs: Invalidate BH LRU during page migration 3039d8580c BACKPORT: FROMLIST: mm: disable LRU pagevec during the migration temporarily 134ac2d4dc FROMLIST: mm: replace migrate_prep with lru_add_drain_all a71a3e1ce6 UPSTREAM: mm: migrate: initialize err in do_migrate_pages 059eaf82c0 UPSTREAM: mm: migrate: clean up migrate_prep{_local} be409db652 ANDROID: Clang LTO: Only set -fvisibility=hidden for x86 02efd18b77 UPSTREAM: usb: typec: tcpci: Refactor tcpc_presenting_cc1_rd macro 8d03e49505 ANDROID: mm: build alloc_contig_dump_pages in page_alloc.o 28f6641041 FROMLIST: mm: page_alloc: dump migrate-failed pages cc1f93cb20 ANDROID: sched: Add vendor hook for uclamp_eff_get 5e1e3e9387 ANDROID: cpu/hotplug: failure to offline 2nd to last cpu 2c728929c1 ANDROID: qcom: Add devm_blk_ksm_init to ABI 9108e9ba66 ANDROID: arm64: add vendor hooks for unusal abort cases 5f1e1f42a5 UPSTREAM: powercap/drivers/dtpm: Fix size of object being allocated fd2c659694 UPSTREAM: powercap/drivers/dtpm: Fix an IS_ERR() vs NULL check 2a1cd71862 UPSTREAM: powercap/drivers/dtpm: Fix some missing unlock bugs 7112d4320f UPSTREAM: powercap/drivers/dtpm: Fix a double shift bug 578572c48c UPSTREAM: powercap/drivers/dtpm: Fix __udivdi3 and __aeabi_uldivmod unresolved symbols 7f17016dc8 UPSTREAM: powercap/drivers/dtpm: Add CPU energy model based support 082e8dcea9 UPSTREAM: powercap/drivers/dtpm: Add API for dynamic thermal power management Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: If05a0d9902893cd29e8bb5eb175bd4ce30250697		2021-03-21 15:02:08 +01:00
..
core	Merge branch 'android12-5.10' into branch 'android12-5.10-lts'	2021-03-21 15:02:08 +01:00
host	Merge branch 'android12-5.10' into branch 'android12-5.10-lts'	2021-03-21 15:02:08 +01:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00