Commit e9b3e47f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.10' into branch 'android12-5.10-lts'



Catch up with the latest android12-5.10 changes into android12-5.10-lts.
Included in here are the following commits:

* e2658821 ANDROID: Add __nocfi return for swsusp_arch_resume
* 028de5c4 BACKPORT: arm64: mm: Make hibernation aware of KFENCE
* d615d2d8 Merge tag 'android12-5.10.210_r00' into branch android12-5.10
* 178bf27b UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* 9f5f2481 ANDROID: kbuild: Search external devicetree path when running clean target
* 50b4a2a7 ANDROID: kbuild: add support for compiling external device trees
* fe033e0b ANDROID: usb: gadget: ncm: Introduce vendor opts to deal with ABI breakage
* 19eb358d UPSTREAM: usb: gadget: ncm: Fix endianness of wMaxSegmentSize variable in ecm_desc
* 38958820 UPSTREAM: usb: gadget: ncm: Add support to update wMaxSegmentSize via configfs
* 43bb9f84 ANDROID: usb: Optimize the problem of slow transfer rate in USB accessory mode
* b2c2d74c ANDROID: ABI: Update honor symbol list
* 33c78af4 ANDROID: add vendor hook in do_read_fault to tune fault_around_bytes
* 7fc588d6 FROMGIT: usb: dwc3: Wait unconditionally after issuing EndXfer command
* 923b677c ANDROID: irq: put irq_resolve_mapping under protection of __irq_enter_raw
* 602a22e7 ANDROID: abi_gki_aarch64_qcom: Add clk_restore_context and clk_save_context
* b493b35d UPSTREAM: usb: gadget: ncm: Fix handling of zero block length packets
* c344c3eb UPSTREAM: usb: gadget: ncm: Avoid dropping datagrams of properly parsed NTBs
* 626e5dce ANDROID: 16K: Fix show maps CFI failure
* 09da1d14 ANDROID: 16K: Handle pad VMA splits and merges
* 162de86e ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 000bbad8 ANDROID: 16K: Only madvise padding from dynamic linker context
* ebf0750a ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* abbc0d53 ANDROID: 16K: Exclude ELF padding for fault around range
* 778abad3 ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* 37d6ffe5 ANDROID: 16K: Introduce ELF padding representation for VMAs
* 38c464b4 ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* 28019375 ANDROID: GKI: Update symbols to symbol list
* 10162303 UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* 582e001b UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* cd2fc5a6 UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
* 5fa75201 UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
* ecd8068f BACKPORT: mm: update mark_victim tracepoints fields
* 4571e647 Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"
* beecd97e UPSTREAM: usb: gadget: uvc: decrease the interrupt load to a quarter
* ad31e246 UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path

Change-Id: I0f7cad212c9425224ade80ed88ef8f0b8046827a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ca0eb541 e2658821
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment