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

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

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



Sync up with android11-5.4 for the following commits:

2ddac378 BACKPORT: ALSA: pcm: Fix races among concurrent prealloc proc writes
6ef42e57 BACKPORT: ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls
32745ed2 BACKPORT: ALSA: pcm: Fix races among concurrent read/write and buffer changes
bf4e161b ANDROID: Fix up abi issue with struct snd_pcm_runtime
3026e826 BACKPORT: ALSA: pcm: Fix races among concurrent hw_params and hw_free calls
46eb6b61 BACKPORT: nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs
375c2e2c Merge tag 'android11-5.4.191_r01' into android11-5.4
e7792e27 BACKPORT: scsi: ufs: Resume ufs host before accessing ufs device
12bf063c BACKPORT: can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
1ae6fd7e ANDROID: ABI: Added symbols for allwinner
7d33bb90 BACKPORT: can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
09c810c7 BACKPORT: esp: Fix possible buffer overflow in ESP transformation
f896faff ANDROID: ABI: Update allowed list for QCOM
0840b185 ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
7f04e0c3 BACKPORT: staging: ion: Prevent incorrect reference counting behavour
9adbfa63 FROMGIT: net: fix wrong network header length
2586f040 ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__
d2ed4cfc ANDROID: Add flag to indicate compiling against ACK
850a2f98 BACKPORT: net/packet: fix slab-out-of-bounds access in packet_recvmsg()
45e2b6a2 BACKPORT: block: Add a helper to validate the block size
353ca06c BACKPORT: virtio-blk: Use blk_validate_block_size() to validate block size
4177a169 BACKPORT: fuse: fix pipe buffer lifetime for direct_io
39435ab3 ANDROID: ABI: Update allowed list for galaxy

And track more new symbols that are coming from the 'android11-5.4'
branch:

Leaf changes summary: 12 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 9 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 3 Added variables

9 Added functions:

  [A] 'function void* __devm_alloc_percpu(device*, size_t, size_t)'
  [A] 'function int blkdev_fsync(file*, loff_t, loff_t, int)'
  [A] 'function void devm_extcon_dev_free(device*, extcon_dev*)'
  [A] 'function gen_pool* devm_gen_pool_create(device*, int, int, const char*)'
  [A] 'function loff_t fixed_size_llseek(file*, loff_t, int, loff_t)'
  [A] 'function u64 get_random_u64()'
  [A] 'function void kmsg_dump_rewind(kmsg_dumper*)'
  [A] 'function u64 nsec_to_clock_t(u64)'
  [A] 'function int unregister_die_notifier(notifier_block*)'

3 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_printk_store'
  [A] 'tracepoint __tracepoint_android_vh_show_regs'
  [A] 'kernel_cpustat kernel_cpustat'

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I81e7c0853a4dd0be2c64403b767725c612b0340c
parents 8e932637 2ddac378
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