commit 7055541caeda53d6275f23b878618d609132e955
author Greg Kroah-Hartman <gregkh@google.com> Mon Nov 24 09:59:36 2025 +0000
committer Greg Kroah-Hartman <gregkh@google.com> Mon Nov 24 09:59:37 2025 +0000
tree ebf1be6bc832a05dcf44fd1b5116717c4204c2be
parent b2957a0ebc3b9949475a442f9e8ab64ccaa6e087
parent 015fad180aaa1a89c9852ad61e58a0bcce6177c8

Merge tag 'android12-5.4.301_r00' into android12-5.4

This merges the android12-5.4.301_r00 tag into the android12-5.4 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* 015fad180aaa Revert "net: rtnetlink: remove redundant assignment to variable err"
* cc336bbdee6f Revert "net: rtnetlink: add msg kind names"
* 354dcfc466be Revert "net: rtnetlink: add helper to extract msg type's kind"
* 7372a3f036d1 Revert "net: rtnetlink: use BIT for flag values"
* cc545e11aa53 Revert "net: netlink: add NLM_F_BULK delete request modifier"
* c9c4fac5745b Revert "net: rtnetlink: add bulk delete support flag"
* 1ba9cb83054d Revert "net: rtnetlink: fix module reference count leak issue in rtnetlink_rcv_msg"
* 3ba70cf86334 Revert "net: add ndo_fdb_del_bulk"
* 9c0ecd64eb31 Revert "net: rtnetlink: add NLM_F_BULK support to rtnl_fdb_del"
* 11e0d6335992 Revert "rtnetlink: Allow deleting FDB entries in user namespace"
* ec814af4f032 ANDROID: GKI: fix up build break where timer_delete_sync() was used
*   2e41af6d9b2b Merge 5.4.301 into android12-5.4-lts
|\
| * 2e58fc1413e9 Linux 5.4.301
| * 283ee8ce3b31 net: rtnetlink: fix module reference count leak issue in rtnetlink_rcv_msg
| * 7d993371c1de media: s5p-mfc: remove an unused/uninitialized variable
| * 61e8a8c424b5 NFSD: Fix last write offset handling in layoutcommit
| * 702d8d6e7e4e NFSD: Minor cleanup in layoutcommit processing
| * a39ae0d8f860 padata: Reset next CPU when reorder sequence wraps around
| * 07861d637168 KEYS: trusted_tpm1: Compare HMAC values in constant time
| * a75994dd8794 NFSD: Define a proc_layoutcommit for the FlexFiles layout type
| * b5abafd0aa8d vfs: Don't leak disconnected dentries on umount
| * 71cdb58dc73c jbd2: ensure that all ongoing I/O complete before freeing blocks
| * 4954d297c91d ext4: detect invalid INLINE_DATA + EXTENTS flag combination
| * 301c668d5e21 drm/amdgpu: use atomic functions with memory barriers for vm fault info
| * 7bf46ff83a0e ext4: avoid potential buffer over-read in parse_apply_sb_mount_options()
| * 05eb29effea6 spi: cadence-quadspi: Flush posted register writes before DAC access
| * 4612070e4cb1 spi: cadence-quadspi: Flush posted register writes before INDAC access
| * 5879837bfe46 memory: samsung: exynos-srom: Fix of_iomap leak in exynos_srom_probe
| * a8e7fc99d44e memory: samsung: exynos-srom: Correct alignment
| * 133bb61caf44 arm64: errata: Apply workarounds for Neoverse-V3AE
| * 0db16ce5e57c arm64: cputype: Add Neoverse-V3AE definitions
| * 4ffea48c69cb comedi: fix divide-by-zero in comedi_buf_munge()
| * 9d053f985613 binder: remove "invalid inc weak" check
| * 428c8047526a xhci: dbc: enable back DbC in resume if it was enabled before suspend
| * 02a089cf4042 usb/core/quirks: Add Huawei ME906S to wakeup quirk
| * 2b24cd3ab1c7 USB: serial: option: add Telit FN920C04 ECM compositions
| * e9639d4237e8 USB: serial: option: add Quectel RG255C
| * 84c73088ec0d USB: serial: option: add UNISOC UIS7720
| * 14b68ab4f671 net: ravb: Ensure memory write completes before ringing TX doorbell
| * a8749742e6dc net: usb: rtl8150: Fix frame padding
| * 93166bc53c0e ocfs2: clear extent cache after moving/defragmenting extents
| * d7fb245842b1 MIPS: Malta: Fix keyboard resource preventing i8042 driver from registering
| * 5568efa5bd15 Revert "cpuidle: menu: Avoid discarding useful information"
| * 839028e70a53 net: bonding: fix possible peer notify event loss or dup issue
| * 61cda2777b07 sctp: avoid NULL dereference when chunk data buffer is missing
| * b735a3e81b3e arm64, mm: avoid always making PTE dirty in pte_mkwrite()
| * 5f192fdc2688 net: enetc: correct the value of ENETC_RXB_TRUESIZE
| * 509da3463fdf rtnetlink: Allow deleting FDB entries in user namespace
| * 4b7140925d9d net: rtnetlink: add NLM_F_BULK support to rtnl_fdb_del
| * 7111cc9552ef net: add ndo_fdb_del_bulk
| * 2b0d1dc340ba net: rtnetlink: add bulk delete support flag
| * 6dea96a84139 net: netlink: add NLM_F_BULK delete request modifier
| * b3eed4bf84fa net: rtnetlink: use BIT for flag values
| * 85c154222dba net: rtnetlink: add helper to extract msg type's kind
| * a8b1eeb93184 net: rtnetlink: add msg kind names
| * c49d31809af2 net: rtnetlink: remove redundant assignment to variable err
| * fdc821782075 m68k: bitops: Fix find_*_bit() signatures
| * 7e173b4ee13c hfsplus: return EIO when type of hidden directory mismatch in hfsplus_fill_super()
| * fc56548fca73 hfs: fix KMSAN uninit-value issue in hfs_find_set_zero_bits()
| * 1b87b8f872a0 dlm: check for defined force value in dlm_lockspace_release
| * a2bee43b4516 hfsplus: fix KMSAN uninit-value issue in hfsplus_delete_cat()
| * f7d9f600c7c3 hfs: validate record offset in hfsplus_bmap_alloc
| * c1ec90bed504 hfsplus: fix KMSAN uninit-value issue in __hfsplus_ext_cache_extent()
| * f823d2730883 hfs: make proper initalization of struct hfs_find_data
| * 257271282a1e hfs: clear offset and space out of valid records in b-tree node
| * 577b13e5b25f exec: Fix incorrect type for ret
| * 603158d4efa9 hfsplus: fix slab-out-of-bounds read in hfsplus_strcasecmp()
| * 719682627487 ALSA: firewire: amdtp-stream: fix enum kernel-doc warnings
| * d0936c8b0743 sched/fair: Fix pelt lost idle time detection
| * ca51183ed9b9 sched/balancing: Rename newidle_balance() => sched_balance_newidle()
| * 7335a5a0064c sched/fair: Trivial correction of the newidle_balance() comment
| * d8dd04003ccc sched: Make newidle_balance() static again
| * 3477af702628 tls: don't rely on tx_work during send()
| * 12027b099064 tls: always set record_type in tls_process_cmsg
| * e06a8f2ff7c1 tg3: prevent use of uninitialized remote_adv and local_adv variables
| * 8b7ac7af3a66 tcp: fix tcp_tso_should_defer() vs large RTT
| * 96fac1bbd2db amd-xgbe: Avoid spurious link down messages during interface toggle
| * 566f8d5c8a44 net/ip6_tunnel: Prevent perpetual tunnel growth
| * eb8be540b50d net: dlink: handle dma_map_single() failure properly
| * 75ca4fd107e2 net: dl2k: switch from 'pci_' to 'dma_' API
| * 6c397c1b3336 media: pci: ivtv: Add missing check after DMA map
| * 1b00b7335000 media: pci/ivtv: switch from 'pci_' to 'dma_' API
| * 979dca8d2465 xen/events: Update virq_to_irq on migration
| * 83fc1f68fb82 media: lirc: Fix error handling in lirc_register()
| * bc35a8cc8a34 media: rc: Directly use ida_free()
| * e73416a10864 drm/exynos: exynos7_drm_decon: remove ctx->suspended
| * 60de2f55d2ac btrfs: avoid potential out-of-bounds in btrfs_encode_fh()
| * da3cadb8b0f3 pwm: berlin: Fix wrong register in suspend/resume
| * 18b7e4b960c2 media: cx18: Add missing check after DMA map
| * 0aa9e273ac76 xen/events: Cleanup find_virq() return codes
| * 68151c7120d6 cramfs: Verify inode mode when loading from disk
| * 6ad65ae94d0b fs: Add 'initramfs_options' to set initramfs mount options
| * 75dbc029c535 pid: Add a judgment for ns null in pid_nr_ns
| * 6b9f2563bdc9 minixfs: Verify inode mode when loading from disk
| * 07926ce598a9 tracing: Fix race condition in kprobe initialization causing NULL pointer dereference
| * 9dc43ea6a20f dm: fix NULL pointer dereference in __dm_suspend()
| * 642ff3983821 mfd: intel_soc_pmic_chtdc_ti: Set use_single_read regmap_config flag
| * 09fa52968a7d mfd: intel_soc_pmic_chtdc_ti: Drop unneeded assignment for cache_type
| * b8a208382268 mfd: intel_soc_pmic_chtdc_ti: Fix invalid regmap-config max_register value
| * 54170057a5fa Squashfs: reject negative file sizes in squashfs_read_inode()
| * 5b5cd739c54d Squashfs: add additional inode sanity checking
| * dd156f44ea82 media: mc: Clear minor number before put device
| * 38bdc302c567 mfd: vexpress-sysreg: Check the return value of devm_gpiochip_add_data()
| * 14496175b264 fs: udf: fix OOB read in lengthAllocDescs handling
| * a908eca43778 KVM: x86: Don't (re)check L1 intercepts when completing userspace I/O
| * a5901a0dfb59 net/9p: fix double req put in p9_fd_cancelled
| * ea39e712c2f5 ext4: guard against EA inode refcount underflow in xattr update
| * 7a1286e5a8c0 ext4: correctly handle queries for metadata mappings
| * a87def3f44f0 ext4: increase i_disksize to offset + len in ext4_update_disksize_before_punch()
| * 16013e03e440 nfsd: nfserr_jukebox in nlm_fopen should lead to a retry
| * 1c572370fd0b x86/umip: Fix decoding of register forms of 0F 01 (SGDT and SIDT aliases)
| * ad5c71fa9b5d x86/umip: Check that the instruction opcode is at least two bytes
| * e1bfc50444ac PCI: keystone: Use devm_request_irq() to free "ks-pcie-error-irq" on exit
| * 43a7d0beff07 PCI/AER: Fix missing uevent on recovery when a reset is requested
| * 5c1cd7d405e9 PCI/IOV: Add PCI rescan-remove locking when enabling/disabling SR-IOV
| * 9f363bf6f951 rseq/selftests: Use weak symbol reference, not definition, to link with glibc
| * 524e37f78541 rtc: interface: Fix long-standing race when setting alarm
| * 755e5a8ffb40 rtc: interface: Ensure alarm irq is enabled when UIE is enabled
| * 8613c9fb1c56 mmc: core: SPI mode remove cmd7
| * d70c7265472a mtd: rawnand: fsmc: Default to autodetect buswidth
| * bf70d603afb6 sparc: fix error handling in scan_one_device()
| * bbb085bc0a39 sparc64: fix hugetlb for sun4u
| * b93fa8dc521d sctp: Fix MAC comparison to be constant-time
| * 76307bb5712c scsi: hpsa: Fix potential memory leak in hpsa_big_passthru_ioctl()
| * 9cad93c78898 parisc: don't reference obsolete termio struct for TC* constants
| * 41e5d9cef359 lib/genalloc: fix device leak in of_gen_pool_get()
| * e19da4893748 iio: frequency: adf4350: Fix prescaler usage.
| * ae75b83897fd iio: dac: ad5421: use int type to store negative error codes
| * d0bdae59b257 iio: dac: ad5360: use int type to store negative error codes
| * 4819f5f864ce crypto: atmel - Fix dma_unmap_sg() direction
| * 15ac9579ebda cpufreq: intel_pstate: Fix object lifecycle issue in update_qos_request()
| * 868ce1949721 drm/nouveau: fix bad ret code in nouveau_bo_move_prep
| * 9dc4dc99f9ae media: i2c: mt9v111: fix incorrect type for ret
| * f08cbec8ceb9 firmware: meson_sm: fix device leak at probe
| * aa350332619f xen/manage: Fix suspend error path
| * fe9f84cc90b2 arm64: dts: qcom: msm8916: Add missing MDSS reset
| * 6beaa602f6fc ACPI: debug: fix signedness issues in read/write helpers
| * e2512755bc18 ACPI: TAD: Add missing sysfs_remove_group() for ACPI_TAD_RT
| * 41d73f8054bf tpm_tis: Fix incorrect arguments in tpm_tis_probe_irq_single
| * dae78a1d64ef tpm, tpm_tis: Claim locality before writing interrupt registers
| * 29294dd6f1e7 crypto: essiv - Check ssize for decryption and in-place encryption
| * 4e5a929f5c9c mailbox: zynqmp-ipi: Remove dev.parent check in zynqmp_ipi_free_mboxes
| * 5906eede6ff9 mailbox: zynqmp-ipi: Remove redundant mbox_controller_unregister() call
| * aeb1fe8a52b0 tools build: Align warning options with perf
| * 7a12f1a18413 net: fsl_pq_mdio: Fix device node reference leak in fsl_pq_mdio_probe
| * e359b742eac1 tcp: Don't call reqsk_fastopen_remove() in tcp_conn_request().
| * 1014b83778c8 net/sctp: fix a null dereference in sctp_disposition sctp_sf_do_5_1D_ce()
| * 1822e5287b7d drm/vmwgfx: Fix Use-after-free in validation
| * 2357cf895457 net/mlx4: prevent potential use after free in mlx4_en_do_uc_filter()
| * a6f68f219d4d scsi: mvsas: Fix use-after-free bugs in mvs_work_queue
| * 87e2fc78aa26 scsi: mvsas: Use sas_task_find_rq() for tagging
| * 3a635fab5cd1 scsi: mvsas: Delete mvs_tag_init()
| * c51f9de09174 scsi: libsas: Add sas_task_find_rq()
| * 0cbbf2741f43 clk: nxp: Fix pll0 rate check condition in LPC18xx CGU driver
| * 5bc41ef2e73f clk: nxp: lpc18xx-cgu: convert from round_rate() to determine_rate()
| * 681e7a933f37 perf session: Fix handling when buffer exceeds 2 GiB
| * c8a20c9ef736 rtc: x1205: Fix Xicor X1205 vendor prefix
| * bc4eb7e7df48 perf util: Fix compression checks returning -1 as bool
| * 662995895ff6 iio: frequency: adf4350: Fix ADF4350_REG3_12BIT_CLKDIV_MODE
| * 20fd91624492 clocksource/drivers/clps711x: Fix resource leaks in error paths
| * 1a7fc8fed2bb pinctrl: check the return value of pinmux_ops::get_function_name()
| * 1b317796013f Input: uinput - zero-initialize uinput_ff_upload_compat to avoid info leak
| * 30498c44c2a0 mm: hugetlb: avoid soft lockup when mprotect to large memory area
| * 540aac117eae uio_hv_generic: Let userspace take care of interrupt mask
| * f81a5bc9e924 Squashfs: fix uninit-value in squashfs_get_parent
| * d8e8528007db Revert "net/mlx5e: Update and set Xon/Xoff upon MTU set"
| * 49f9f4c5cb47 net: ena: return 0 in ena_get_rxfh_key_size() when RSS hash key is not configurable
| * 21f7d60a8962 nfp: fix RSS hash key size when RSS is not supported
| * ef442edff2e5 drivers/base/node: fix double free in register_one_node()
| * 283333079d96 ocfs2: fix double free in user_cluster_connect()
| * cce3c0e21cdd net: usb: Remove disruptive netif_wake_queue in rtl8150_set_multicast
| * 18b816380734 RDMA/siw: Always report immediate post SQ errors
| * 0ba8541351bf usb: vhci-hcd: Prevent suspending virtually attached devices
| * b3a6d153861d scsi: mpt3sas: Fix crash in transport port remove by using ioc_info()
| * 8a6ecab3847c ipvs: Defer ip_vs_ftp unregister during netns cleanup
| * 5e4b9160246f NFSv4.1: fix backchannel max_resp_sz verification check
| * f29579803b65 remoteproc: qcom: q6v5: Avoid disabling handover IRQ twice
| * 03db640a5ce3 sparc: fix accurate exception reporting in copy_{from,to}_user for M7
| * c171f8e02aef sparc: fix accurate exception reporting in copy_to_user for Niagara 4
| * 05440320ea3e sparc: fix accurate exception reporting in copy_{from_to}_user for Niagara
| * fdd43fe6d286 sparc: fix accurate exception reporting in copy_{from_to}_user for UltraSPARC III
| * 0bf3dc3a2156 sparc: fix accurate exception reporting in copy_{from_to}_user for UltraSPARC
| * b81739e03355 IB/sa: Fix sa_local_svc_timeout_ms read race
| * bd1aaea359db RDMA/core: Resolve MAC of next-hop device without ARP support
| * c24a1f683b64 wifi: mt76: fix potential memory leak in mt76_wmac_probe()
| * 9f4ef845d273 drivers/base/node: handle error properly in register_one_node()
| * 7b323e67d2a6 watchdog: mpc8xxx_wdt: Reload the watchdog timer when enabling the watchdog
| * e16592112dd3 netfilter: ipset: Remove unused htable_bits in macro ahash_region
| * e7c31aac98c1 iio: consumers: Fix offset handling in iio_convert_raw_to_processed()
| * bff827b0d507 ASoC: Intel: bytcr_rt5651: Fix invalid quirk input mapping
| * 2c27e047bdcb ASoC: Intel: bytcr_rt5640: Fix invalid quirk input mapping
| * ef7028c957cb ASoC: Intel: bytcht_es8316: Fix invalid quirk input mapping
| * 38c7bb10aae5 pps: fix warning in pps_register_cdev when register device fail
| * 3564c62d10ca misc: genwqe: Fix incorrect cmd field being reported in error
| * b86de42c4276 usb: gadget: configfs: Correctly set use_os_string at bind
| * a88df3897031 usb: phy: twl6030: Fix incorrect type for ret
| * 4f88c5c187d3 tcp: fix __tcp_close() to only send RST when required
| * c523bdc6ae15 PCI: tegra: Fix devm_kcalloc() argument order for port->phys allocation
| * 58ce953c0163 wifi: mwifiex: send world regulatory domain to driver
| * 534b6c26d171 ALSA: lx_core: use int type to store negative error codes
| * a05e38d17901 media: rj54n1cb0c: Fix memleak in rj54n1_probe()
| * d186a8200b0d scsi: myrs: Fix dma_alloc_coherent() error check
| * d94be0a6ae9a scsi: pm80xx: Fix array-index-out-of-of-bounds on rmmod
| * 148aba0be56f serial: max310x: Add error checking in probe()
| * 89838fe5c6c0 usb: host: max3421-hcd: Fix error pointer dereference in probe cleanup
| * 3e992a82d5dc drm/radeon/r600_cs: clean up of dead code in r600_cs
| * 46b35621d669 i2c: designware: Add disabling clocks when probe fails
| * 7dc48c447a24 i2c: mediatek: fix potential incorrect use of I2C_MASTER_WRRD
| * de44cdc50d2d bpf: Explicitly check accesses to bpf_sock_addr
| * 93818c7ce48c selftests: watchdog: skip ping loop if WDIOF_KEEPALIVEPING not supported
| * abf7cf212a20 pwm: tiehrpwm: Fix corner case in clock divisor calculation
| * 48d6e1424cb1 block: use int to store blk_stack_limits() return value
| * a8c53553f183 blk-mq: check kobject state_in_sysfs before deleting in blk_mq_unregister_hctx
| * 6d39bc327cdb pinctrl: meson-gxl: add missing i2c_d pinmux
| * cdf96ac33a48 soc: qcom: rpmh-rsc: Unconditionally clear _TRIGGER bit for TCS
| * 7c4d9b317723 ACPI: processor: idle: Fix memory leak when register cpuidle device failed
| * 4b48bfa2e5b5 regmap: Remove superfluous check for !config in __regmap_init()
| * dfd57c62101b x86/vdso: Fix output operand size of RDPID
| * 656e9a5d69ac perf: arm_spe: Prevent overflow in PERF_IDX2OFF()
| * a9f8f33f5dd7 driver core/PM: Set power.no_callbacks along with power.no_pm
| * 86bdd3decac6 staging: axis-fifo: flush RX FIFO on read errors
| * 58738885342a staging: axis-fifo: fix maximum TX packet length check
| * e58778d9c84d perf subcmd: avoid crash in exclude_cmds when excludes is empty
| * cbffccccc8ca dm-integrity: limit MAX_TAG_SIZE to 255
| * 463222f233e6 wifi: rtlwifi: rtl8192cu: Don't claim USB ID 07b8:8188
| * a1f24c2e911a USB: serial: option: add SIMCom 8230C compositions
| * 9348976003e3 media: rc: fix races with imon_disconnect()
| * e1b1ba1864c4 media: imon: grab lock earlier in imon_ir_change_protocol()
| * ab5d16511e44 media: imon: reorganize serialization
| * f61cad824f5a media: rc: Add support for another iMON 0xffdc device
| * 9205fb6e617a media: i2c: tc358743: Fix use-after-free bugs caused by orphan timer in probe
| * bc4ffd962ce1 media: tuner: xc5000: Fix use-after-free in xc5000_release
| * 0006640fb7df media: tunner: xc5000: Refactor firmware load
| * 13550273171f udp: Fix memory accounting leak.
| * 607010d07b8a media: b2c2: Fix use-after-free causing by irq_check_work in flexcop_pci_remove
| * e6eeee5dc0d9 scsi: target: target_core_configfs: Add length check to avoid buffer overflow
* 0d22374acd90 Merge android12-5.4 into android12-5.4-lts

Change-Id: I72fed47a12917e57b51acc7e44361186677fbe21
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>