Files
linux/init
Tao Huang 8569d79cf3 Merge tag 'android14-6.1-2023-12_r1' of https://android.googlesource.com/kernel/common
android14-6.1 December 2023 release 1

Artifacts:
  https://ci.android.com/builds/submitted/11197918/kernel_aarch64/latest

* commit 'android14-6.1-2023-12_r1': (2159 commits)
  ANDROID: Update the ABI symbol list
  ANDROID: GKI: Update symbol list for mtk
  ANDROID: mm: lru_cache_disable skips lru cache drainnig
  ANDROID: mm: cma: introduce __cma_alloc API
  ANDROID: Update the ABI representation
  BACKPORT: fscrypt: support crypto data unit size less than filesystem block size
  UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path
  ANDROID: GKI: Update oplus symbol list
  ANDROID: vendor_hooks: export tracepoint symbol trace_mm_vmscan_kswapd_wake
  BACKPORT: HID: input: map battery system charging
  ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
  FROMGIT: f2fs: skip adding a discard command if exists
  UPSTREAM: f2fs: clean up zones when not successfully unmounted
  UPSTREAM: f2fs: use finish zone command when closing a zone
  UPSTREAM: f2fs: check zone write pointer points to the end of zone
  UPSTREAM: f2fs: close unused open zones while mounting
  UPSTREAM: f2fs: maintain six open zones for zoned devices
  ANDROID: update symbol for unisoc whitelist
  ANDROID: vendor_hooks: mm: add hook to count the number pages allocated for each slab
  ANDROID: Update the ABI symbol list
  ...

Change-Id: I12896fc1aed8717b9a0dc87274ef2cabea9752b2

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/iommu/rockchip-iommu.c
	drivers/power/supply/rk817_charger.c
	drivers/usb/gadget/function/f_uvc.c
	drivers/usb/gadget/function/uvc_v4l2.c
	drivers/usb/gadget/function/uvc_video.c
2024-01-02 15:30:47 +08:00
..