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

Merge branch 'android12-5.4' into 'android12-5.4-lts'



Sync up with android12-5.4 for the following commits:

ffa24218 ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0
21593543 UPSTREAM: cgroup-v1: Require capabilities to set release_agent
287dec2d ANDROID: incremental-fs: remove index and incomplete dir on umount
ac3eac18 UPSTREAM: binder: fix async_free_space accounting for empty parcels
57f9b292 Revert "UPSTREAM: seccomp: Remove bogus __user annotations"
0cc2d3cf ANDROID: GKI: ion: add vendor hook for ion buffer release
b190d449 UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc
9ab297d1 ANDROID: selftests: fix incfs_test
f0ec5aee ANDROID: Incremental-fs: Doc: correct a sysfs path in incfs.rst
68f853dd UPSTREAM: tee: handle lookup of shm with reference count 0
b5b7251e UPSTREAM: wireguard: ratelimiter: use kvcalloc() instead of kvzalloc()
6a775d22 UPSTREAM: wireguard: receive: drop handshakes if queue lock is contended
8deb4c85 UPSTREAM: wireguard: receive: use ring buffer for incoming handshakes
64952923 UPSTREAM: wireguard: device: reset peer src endpoint when netns exits
9712c0ee UPSTREAM: wireguard: selftests: actually test for routing loops
bebcf7a0 UPSTREAM: wireguard: selftests: increase default dmesg log size
dc4f9e40 UPSTREAM: driver core: Fix possible memory leak in device_link_add()
a136f79c UPSTREAM: usb: xhci-mtk: fix issue of out-of-bounds array access
6a6dfe1a UPSTREAM: driver core: Prevent warning when removing a device link from unregistered consumer
f5b9bbd8 ANDROID: incremental-fs: fix mount_fs issue
5a027099 ANDROID: incremental-fs: fix GPF in pending_reads_dispatch_ioctl
3307e1a0 ANDROID: ion: Use nents, orig_nents in struct sg_table correctly
915e227b Merge tag 'android12-5.4.161_r00' into android12-5.4
fdabaf6a BACKPORT: userfaultfd: wp: declare _UFFDIO_WRITEPROTECT conditionally
feb34d67 ANDROID: kbuild: fix ld_flags missing for LTO
6140ec56 ANDROID: ABI: Update symbols to unisoc whitelist for the 23th
946eff43 UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param

New api symbols added that were being tracked in the android12-5.4
branch:

Leaf changes summary: 2 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

2 Added functions:

  [A] 'function int pm_qos_request(int)'
  [A] 'function int ufshcd_config_pwr_mode(ufs_hba*, ufs_pa_layer_attr*)'

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