A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Sync up with android11-5.4 for the following commits:

2ddac3780b BACKPORT: ALSA: pcm: Fix races among concurrent prealloc proc writes
6ef42e5789 BACKPORT: ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls
32745ed213 BACKPORT: ALSA: pcm: Fix races among concurrent read/write and buffer changes
bf4e161bf9 ANDROID: Fix up abi issue with struct snd_pcm_runtime
3026e8262a BACKPORT: ALSA: pcm: Fix races among concurrent hw_params and hw_free calls
46eb6b6125 BACKPORT: nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs
375c2e2cdb Merge tag 'android11-5.4.191_r01' into android11-5.4
e7792e2790 BACKPORT: scsi: ufs: Resume ufs host before accessing ufs device
12bf063cb9 BACKPORT: can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
1ae6fd7e6f ANDROID: ABI: Added symbols for allwinner
7d33bb909e BACKPORT: can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
09c810c77d BACKPORT: esp: Fix possible buffer overflow in ESP transformation
f896faff41 ANDROID: ABI: Update allowed list for QCOM
0840b18507 ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
7f04e0c309 BACKPORT: staging: ion: Prevent incorrect reference counting behavour
9adbfa635e FROMGIT: net: fix wrong network header length
2586f0405b ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__
d2ed4cfcd5 ANDROID: Add flag to indicate compiling against ACK
850a2f987c BACKPORT: net/packet: fix slab-out-of-bounds access in packet_recvmsg()
45e2b6a26f BACKPORT: block: Add a helper to validate the block size
353ca06c86 BACKPORT: virtio-blk: Use blk_validate_block_size() to validate block size
4177a169eb BACKPORT: fuse: fix pipe buffer lifetime for direct_io
39435ab3a6 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: Greg Kroah-Hartman <[email protected]>
Change-Id: I81e7c0853a4dd0be2c64403b767725c612b0340c
This commit is contained in:
Greg Kroah-Hartman 2022-07-01 12:48:47 +02:00
commit 476819f502
11 changed files with 2148 additions and 2022 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/block/virtio_blk.c
View file

@ -944,7 +944,7 @@ static int virtblk_probe(struct virtio_device *vdev)
dev_err(&vdev->dev,
"virtio_blk: invalid block size: 0x%x\n",
blk_size);
goto out_free_tags;
goto out_cleanup_disk;
}
blk_queue_logical_block_size(q, blk_size);
@ -1016,6 +1016,8 @@ static int virtblk_probe(struct virtio_device *vdev)
device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);
return 0;
out_cleanup_disk:
blk_cleanup_queue(vblk->disk->queue);
out_free_tags:
blk_mq_free_tag_set(&vblk->tag_set);
out_put_disk: