linux/drivers/base
Tao Huang 3d965dc60c Merge tag 'ASB-2022-07-05_12-5.10' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2022-07-01
CVE-2020-29374
CVE-2022-20227

* tag 'ASB-2022-07-05_12-5.10': (39 commits)
  ANDROID: GKI: Add symbols to abi_gki_aarch64_transsion
  BACKPORT: nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs
  ANDROID: vendor_hook: Add hook in __free_pages()
  ANDROID: create and export is_swap_slot_cache_enabled
  ANDROID: vendor_hook: Add hook in swap_slots
  ANDROID: mm: export swapcache_free_entries
  ANDROID: mm: export symbols used in vendor hook android_vh_get_swap_page()
  ANDROID: vendor_hooks: Add hooks to extend struct swap_slots_cache
  ANDROID: mm: export swap_type_to_swap_info
  ANDROID: vendor_hook: Add hook in si_swapinfo()
  ANDROID: vendor_hooks: Add hooks to extend the struct swap_info_struct
  ANDROID: vendor_hook: Add hooks in unuse_pte_range() and try_to_unuse()
  ANDROID: vendor_hook: Add hooks in free_swap_slot()
  ANDROID: vendor_hook: Add hook to update nr_swap_pages and total_swap_pages
  ANDROID: vendor_hook: Add hook in page_referenced_one()
  ANDROID: vendor_hooks: Add hooks to record the I/O statistics of swap:
  ANDROID: vendor_hook: Add hook in migrate_page_states()
  ANDROID: vendor_hook: Add hook in __migration_entry_wait()
  ANDROID: vendor_hook: Add hook in handle_pte_fault()
  ANDROID: vendor_hook: Add hook in do_swap_page()
  ...

Change-Id: I36501f339e4d9d46aade317ea3ccd32bce7f1b8c

Conflicts:
	drivers/usb/gadget/function/uvc_queue.c
2022-07-15 18:11:10 +08:00
..
arm MALI: rockchip: upgrade bifrost DDK to g12p0-01eac0, from g11p0-01eac0o 2022-06-21 11:27:08 +08:00
firmware_loader firmware_loader: fix pre-allocated buf built-in firmware use 2021-11-26 10:39:10 +01:00
power This is the 5.10.110 stable release 2022-04-18 17:41:18 +02:00
regmap Merge tag 'android12-5.10.101_r00' into android12-5.10 2022-03-21 14:29:02 +01:00
test
arch_topology.c ANDROID: topology: Add flag to indicate topology has been updated 2021-05-11 22:55:07 +00:00
attribute_container.c
base.h
bus.c
cacheinfo.c
class.c
component.c
container.c
core.c Merge tag 'android12-5.10.101_r00' into android12-5.10 2022-03-21 14:29:02 +01:00
cpu.c
dd.c This is the 5.10.110 stable release 2022-04-18 17:41:18 +02:00
devcoredump.c FROMLIST: devcoredump : Serialize devcd_del work 2022-06-16 18:03:28 +00:00
devres.c
devtmpfs.c devtmpfs regression fix: reconfigure on each mount 2022-01-20 09:17:49 +01:00
driver.c
firmware.c
hypervisor.c
init.c
isa.c
Kconfig MALI: rockchip: upgrade bifrost DDK to g7p1-01bet0, from g6p0-01eac0 2021-10-29 18:44:22 +08:00
Makefile MALI: rockchip: upgrade bifrost DDK to g6p0-01eac0, from g2p0-01eac0 2021-10-29 18:44:22 +08:00
map.c
memory.c
module.c
node.c node: fix device cleanups in error handling code 2021-05-14 09:50:19 +02:00
pinctrl.c
platform-msi.c
platform.c
property.c This is the 5.10.94 stable release 2022-01-27 11:49:22 +01:00
soc.c
swnode.c This is the 5.10.94 stable release 2022-01-27 11:49:22 +01:00
syscore.c
topology.c
transport_class.c