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

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



Sync up with android12-5.4 for the following commits:

148e4ba7 ANDROID: ABI: update symbols to sunxi whitelist for sunxi-nsipmu and sunxi-dmc driver
fa9c78c0 BACKPORT: nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs
f2ce1d10 BACKPORT: ALSA: pcm: Fix races among concurrent prealloc proc writes
e6367460 BACKPORT: ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls
6b531c84 BACKPORT: ALSA: pcm: Fix races among concurrent read/write and buffer changes
9df52648 ANDROID: Fix up abi issue with struct snd_pcm_runtime
cb31d3e6 BACKPORT: ALSA: pcm: Fix races among concurrent hw_params and hw_free calls
e2e1ece5 ANDROID: GKI: update xml for TRANSSION modules
4a9263b4 ANDROID: GKI: add symbols list for transsion modules
36505143 ANDROID: scheduler: export task_sched_runtime
83fd743d ANDROID: sched/core: Export symbols needed by modules
24dbfde0 ANDROID: sched: Export few scheduler symbols for vendor modules
fc40c5fb ANDROID: cfi: Change synchronize_rcu to synchronize_rcu_expedited
21ada6a3 ANDROID: ABI: Update symbols to unisoc whitelist for ufs 1th
9ce4508d ANDROID: ABI: Update symbols to unisoc whitelist for the 28th
4cc9c9d7 ANDROID: Configure out the macros in android_kabi and android_vendor
77dc925d UPSTREAM: Revert "net: micrel: fix KS8851_MLL Kconfig"
29b9888e UPSTREAM: block/compat_ioctl: fix range check in BLKGETSIZE
5b70ae61 UPSTREAM: spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller
3423d34d UPSTREAM: jbd2: fix a potential race while discarding reserved buffers after an abort
54c36aa4 UPSTREAM: ext4: force overhead calculation if the s_overhead_cluster makes no sense
2ed03231 UPSTREAM: ext4: fix overhead calculation to account for the reserved gdt blocks
2865b811 UPSTREAM: ext4, doc: fix incorrect h_reserved size
6701fa12 UPSTREAM: ext4: limit length to bitmap_maxbytes - blocksize in punch_hole
c347f453 UPSTREAM: ext4: fix use-after-free in ext4_search_dir
fe627587 UPSTREAM: ext4: fix symlink file size not match to file content
3dd196f8 UPSTREAM: arm_pmu: Validate single/group leader events
e6fa93b9 UPSTREAM: ARC: entry: fix syscall_trace_exit argument
774d9fdb UPSTREAM: e1000e: Fix possible overflow in LTR decoding
3b481150 UPSTREAM: ASoC: soc-dapm: fix two incorrect uses of list iterator
cf3fa5ee UPSTREAM: openvswitch: fix OOB access in reserve_sfa_size()
9dc37008 UPSTREAM: xtensa: fix a7 clobbering in coprocessor context load/store
548fb7a7 UPSTREAM: xtensa: patch_text: Fixup last cpu should be master
eb52d746 UPSTREAM: powerpc/perf: Fix power9 event alternatives
ba94a09f UPSTREAM: drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage
fa26e0c5 UPSTREAM: KVM: PPC: Fix TCE handling for VFIO
4d65fd95 UPSTREAM: drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare
7691bf02 UPSTREAM: drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised
382ef1db UPSTREAM: dma: at_xdmac: fix a missing check on list iterator
86fdb50d UPSTREAM: ata: pata_marvell: Check the 'bmdma_addr' beforing reading
b9c3a995 UPSTREAM: EDAC/synopsys: Read the error count from the correct register
78b8e288 UPSTREAM: stat: fix inconsistency between struct stat and struct compat_stat
26d03a66 UPSTREAM: scsi: qedi: Fix failed disconnect handling
5062d350 UPSTREAM: net: macb: Restart tx only if queue pointer is lagging
a90d8e0d UPSTREAM: drm/msm/mdp5: check the return of kzalloc()
2b35437c UPSTREAM: dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info()
1c3c6f87 UPSTREAM: brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant
d3a0d8d1 UPSTREAM: mt76: Fix undefined behavior due to shift overflowing the constant
62eeeec8 UPSTREAM: cifs: Check the IOCB_DIRECT flag, not O_DIRECT
21826fc9 UPSTREAM: vxlan: fix error return code in vxlan_fdb_append
6e773989 UPSTREAM: ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant
49b1c45c UPSTREAM: platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative
ff81cbff UPSTREAM: reset: tegra-bpmp: Restore Handle errors in BPMP response
e69a39f8 UPSTREAM: ARM: vexpress/spc: Avoid negative array index when !SMP
8b3d631d UPSTREAM: selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets
d5433471 UPSTREAM: netlink: reset network and mac headers in netlink_dump()
c7f6333f UPSTREAM: l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu
1c24fe35 UPSTREAM: net/sched: cls_u32: fix possible leak in u32_init_knode()
782e68a1 UPSTREAM: net/packet: fix packet_sock xmit return value checking
6fb2161f UPSTREAM: net/smc: Fix sock leak when release after smc_shutdown()
7dee356a UPSTREAM: rxrpc: Restore removed timer deletion
d8c440b7 UPSTREAM: igc: Fix BUG: scheduling while atomic
fbbc60dc UPSTREAM: igc: Fix infinite loop in release_swfw_sync
1176b00a UPSTREAM: dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources
38859c35 UPSTREAM: dmaengine: imx-sdma: Fix error checking in sdma_event_remap
01a34428 UPSTREAM: ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component
c3328482 UPSTREAM: ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek
d051ac8c UPSTREAM: ALSA: usb-audio: Clear MIDI port active flag after draining
284f1a74 UPSTREAM: tcp: Fix potential use-after-free due to double kfree()
79b37f57 UPSTREAM: tcp: fix race condition when creating child sockets from syncookies
485fece7 UPSTREAM: gfs2: assign rgrp glock before compute_bitstructs
583215ec UPSTREAM: tracing: Dump stacktrace trigger to the corresponding instance
1eba762e UPSTREAM: mm: page_alloc: fix building error on -Werror=array-compare
85a37f6f UPSTREAM: etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead
3716b228 BACKPORT: net/sched: cls_u32: fix netns refcount changes in u32_change()
c79dfbc2 ANDROID: ABI: Update symbols to unisoc whitelist for the 28th
a4d27a2c FROMLIST: remoteproc: Fix dma_mem leak after rproc_shutdown
4be3dc69 FROMLIST: dma-mapping: Add dma_release_coherent_memory to DMA API
8bb18738 Merge tag 'android12-5.4.191_r00' into android12-5.4
45f8ea05 ANDROID: ABI: Update symbols to unisoc whitelist for the 29th
c9c95f65 ANDROID: ABI: Update symbols to unisoc whitelist for the 28th
4958d038 UPSTREAM: arm64/sparsemem: reduce SECTION_SIZE_BITS
7926bf36 BACKPORT: can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
158ef027 BACKPORT: can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
ee52e8cb BACKPORT: esp: Fix possible buffer overflow in ESP transformation
b2ca0128 ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
f48f8f7c BACKPORT: staging: ion: Prevent incorrect reference counting behavour
7038196c ANDROID: ABI: Update the symbol list for the mac80211_hwsim ko
9aefe7a5 FROMGIT: net: fix wrong network header length
0e9e1752 UPSTREAM: kfence: fix memory leak when cat kfence objects
b0f1cf1c ANDROID: ABI: Update symbols to unisoc whitelist for the 27th
fef319f4 ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__
1a524d4d ANDROID: Add flag to indicate compiling against ACK
a6d97349 BACKPORT: block: Add a helper to validate the block size
cad77235 BACKPORT: fuse: fix pipe buffer lifetime for direct_io
a8723c22 BACKPORT: virtio-blk: Use blk_validate_block_size() to validate block size
4b9ad0db BACKPORT: net/packet: fix slab-out-of-bounds access in packet_recvmsg()
99f7ebe8 ANDROID: ABI: Update symbols for transsion FFU(Field Firmware Update)

And add new symbols that now need to be tracked, that came from the
'android12-5.4' branch.

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

31 Added functions:

  [A] 'function reset_control* __reset_control_get(device*, const char*, int, bool, bool, bool)'
  [A] 'function int _raw_read_trylock(rwlock_t*)'
  [A] 'function vm_struct* alloc_vm_area(size_t, pte_t**)'
  [A] 'function dentry* debugfs_lookup(const char*, dentry*)'
  [A] 'function int devfreq_event_disable_edev(devfreq_event_dev*)'
  [A] 'function int devfreq_event_enable_edev(devfreq_event_dev*)'
  [A] 'function devfreq_event_dev* devfreq_event_get_edev_by_phandle(device*, int)'
  [A] 'function devfreq_event_dev* devm_devfreq_event_add_edev(device*, devfreq_event_desc*)'
  [A] 'function void emergency_restart()'
  [A] 'function pid* find_get_pid(pid_t)'
  [A] 'function bool ieee80211_tx_prepare_skb(ieee80211_hw*, ieee80211_vif*, sk_buff*, int, ieee80211_sta**)'
  [A] 'function scsi_device* scsi_device_lookup(Scsi_Host*, uint, uint, u64)'
  [A] 'function int scsi_device_quiesce(scsi_device*)'
  [A] 'function void scsi_device_resume(scsi_device*)'
  [A] 'function list_head* seq_list_next(void*, list_head*, loff_t*)'
  [A] 'function list_head* seq_list_start(list_head*, loff_t)'
  [A] 'function long long unsigned int task_sched_runtime(task_struct*)'
  [A] 'function unsigned long int uclamp_eff_value(task_struct*, uclamp_id)'
  [A] 'function void ufshcd_auto_hibern8_update(ufs_hba*, u32)'
  [A] 'function void ufshcd_delay_us(unsigned long int, unsigned long int)'
  [A] 'function void ufshcd_fixup_dev_quirks(ufs_hba*, ufs_dev_fix*)'
  [A] 'function int ufshcd_hold(ufs_hba*, bool)'
  [A] 'function int ufshcd_query_attr(ufs_hba*, query_opcode, attr_idn, u8, u8, u32*)'
  [A] 'function int ufshcd_query_descriptor_retry(ufs_hba*, query_opcode, desc_idn, u8, u8, u8*, int*)'
  [A] 'function int ufshcd_query_flag(ufs_hba*, query_opcode, flag_idn, u8, bool*)'
  [A] 'function void ufshcd_release(ufs_hba*)'
  [A] 'function void unmap_kernel_range(unsigned long int, unsigned long int)'
  [A] 'function usb_hcd* usb_create_shared_hcd(const hc_driver*, device*, const char*, usb_hcd*)'
  [A] 'function irqreturn_t usb_hcd_irq(int, void*)'
  [A] 'function int verify_pkcs7_signature(void*, size_t, void*, size_t, key*, key_being_used_for, int (void*, void*, typedef size_t, typedef size_t)*, void*)'
  [A] 'function void yield()'

2 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_ufs_prepare_command'
  [A] 'unsigned long int cpu_scale'

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