Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit b6d6caab authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into android11-5.4-lts



Sync up with android11-5.4 for the following commits:

* b86f2ce5 Merge tag 'android11-5.4.233_r00' into android11-5.4
* 5ccb6ea4 UPSTREAM: ext4: fix another off-by-one fsmap error on 1k block filesystems
* f756dbba UPSTREAM: ext4: refuse to create ea block when umounted
* aefbae5b UPSTREAM: ext4: optimize ea_inode block expansion
* 7431096b UPSTREAM: ext4: allocate extended attribute value in vmalloc area
* 7cfbc750 BACKPORT: FROMGIT: cgroup: Use separate src/dst nodes when preloading css_sets for migration
* b62f2af1 ANDROID: fs/f2fs: fixup __f2fs_cluster_blocks with F2FS_FS_COMPRESSION
* 9f71ba69 UPSTREAM: usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
* 62b8ef04 UPSTREAM: KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS
* 2af3bdf2 UPSTREAM: ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop
* 9adb062d UPSTREAM: net_sched: reject TCF_EM_SIMPLE case for complex ematch module
* 5a1412b3 UPSTREAM: ipv6: ensure sane device mtu in tunnels
* 2490e55f BACKPORT: iommu: Avoid races around device probe
* 3daec397 BACKPORT: mac80211_hwsim: notify wmediumd of used MAC addresses
* b6a441d6 FROMGIT: mac80211_hwsim: add concurrent channels scanning support over virtio
* 1866ee1a ANDROID: ABI: Cuttlefish Symbol update
* e55bdca2 UPSTREAM: media: dvb-core: Fix UAF due to refcount races at releasing
* d72fdcc7 ANDROID: abi_gki_aarch64_qcom: Add hrtimer_sleeper_start_expires
* b63a7aff UPSTREAM: ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF

Update the .xml file with the new symbols being tracked now:

2 Added functions:

  [A] 'function void hrtimer_sleeper_start_expires(hrtimer_sleeper*, hrtimer_mode)'
  [A] 'function bool ieee80211_tx_prepare_skb(ieee80211_hw*, ieee80211_vif*, sk_buff*, int, ieee80211_sta**)'

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