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

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



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

It contains the following commits:

* bdf869ad Revert "genirq: Provide new interfaces for affinity hints"
* 857f8af6 Revert "i40e: Use irq_update_affinity_hint()"
* 22571205 Revert "i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path"
*   ed56c512 Merge 5.4.300 into android12-5.4-lts
|\
| * 86b57fd7 Linux 5.4.300
| * bc1c9ce8 mm/hugetlb: fix folio is still mapped when deleted
| * 0a3f66fa i40e: add mask to apply valid bits for itr_idx
| * 185745d5 i40e: fix validation of VF state in get resources
| * a6ff2af7 i40e: fix idx validation in config queues msg
| * 0543d40d i40e: add validation for ring_len param
| * ad80e711 i40e: increase max descriptors for XL710
| * 61fa824e mm/migrate_device: don't add folio to be freed to LRU in migrate_device_finalize()
| * 4bcf5f7a fbcon: Fix OOB access in font allocation
| * 994bdc2d fbcon: fix integer overflow in fbcon_do_set_font
| * 9176e186 i40e: add max boundary check for VF filters
| * a88c1b27 i40e: fix input validation logic for action_meta
| * b6cb93a7 i40e: fix idx validation in i40e_validate_queue_map
| * 70b0c114 drm/gma500: Fix null dereference in hdmi teardown
| * 572c6568 can: peak_usb: fix shift-out-of-bounds issue
| * 0fa9303c can: mcba_usb: populate ndo_change_mtu() to prevent buffer overflow
| * 063539db can: sun4i_can: populate ndo_change_mtu() to prevent buffer overflow
| * f2c247e9 can: hi311x: populate ndo_change_mtu() to prevent buffer overflow
| * 967c5ab2 can: rcar_can: rcar_can_resume(): fix s2ram with PSCI
| * f979a5d7 IB/mlx5: Fix obj_type mismatch for SRQ event subscriptions
| * f5fcec37 usb: core: Add 0x prefix to quirks debug output
| * d6d69aea ALSA: usb-audio: Fix build with CONFIG_INPUT=n
| * 3d8878dc ALSA: usb-audio: Convert comma to semicolon
| * 104ad9ba ALSA: usb-audio: Add mixer quirk for Sony DualSense PS5
| * 731e6762 ALSA: usb-audio: Remove unneeded wmb() in mixer_quirks
| * 7aa869f7 ALSA: usb-audio: Simplify NULL comparison in mixer_quirks
| * f6d990d3 ALSA: usb-audio: Avoid multiple assignments in mixer_quirks
| * ad4a18c5 ALSA: usb-audio: Fix block comments in mixer_quirks
| * 3aa9dae3 KVM: SVM: Sync TPR from LAPIC into VMCB::V_TPR even if AVIC is active
| * 184f608a net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer
| * 7a174d11 net: rfkill: gpio: add DT support
| * 26606c5f serial: sc16is7xx: fix bug in flow control levels init
| * ea748ebb USB: gadget: dummy-hcd: Fix locking bug in RT-enabled kernels
| * 6070c741 usb: gadget: dummy_hcd: remove usage of list iterator past the loop body
| * 8a82e3a6 ASoC: SOF: Intel: hda-stream: Fix incorrect variable used in error message
| * 8b19c813 ASoC: wm8974: Correct PLL rate rounding
| * cbeccd02 ASoC: wm8940: Correct typo in control name
| * b0aabb6f rds: ib: Increment i_fastreg_wrs before bailing out
| * e7b3519f mmc: mvsdio: Fix dma_unmap_sg() nents value
| * 2ef1649b power: supply: bq27xxx: restrict no-battery detection to bq27000
| * 49b7640e power: supply: bq27xxx: fix error return in case of no bq27000 hdq battery
| * a685684e nilfs2: fix CFI failure when accessing /sys/fs/nilfs2/features/*
| * fde6e731 cnic: Fix use-after-free bugs in cnic_delete_task
| * 34f9bdae net: liquidio: fix overflow in octeon_init_instr_queue()
| * d5cda881 Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set"
| * 7ec092a9 tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect().
| * 6b32f38d i40e: remove redundant memory barrier when cleaning Tx descs
| * 6b8577bf net: natsemi: fix `rx_dropped` double accounting on `netif_rx()` failure
| * cabadd7f cgroup: split cgroup_destroy_wq into 3 workqueues
| * 99830c9b pcmcia: omap_cf: Mark driver struct with __refdata to prevent section mismatch
| * a7106867 wifi: mac80211: fix incorrect type for ret
| * 6e0b8d96 ALSA: firewire-motu: drop EPOLLOUT from poll return values as write is not supported
| * 8e01ea18 mm/memory-failure: fix VM_BUG_ON_PAGE(PagePoisoned(page)) when unpoison memory
| * 64faf7d6 soc: qcom: mdt_loader: Deal with zero e_shentsize
| * 289a414a phy: ti-pipe3: fix device leak at unbind
| * 2e257a61 dmaengine: qcom: bam_dma: Fix DT error handling for num-channels/ees
| * 7d4de60d dmaengine: ti: edma: Fix memory allocation size for queue_priority_map
| * ed4d6126 can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails
| * f23fe24f can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed
| * 13ab9ade i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path
| * 18c4c357 i40e: Use irq_update_affinity_hint()
| * 7b2a6732 genirq: Provide new interfaces for affinity hints
| * 4dbabe8e genirq: Export affinity setter for modules
| * 6fe90f60 genirq/affinity: Add irq_update_affinity_desc()
| * 4a069b11 igb: fix link test skipping when interface is admin down
| * 8c60d12b net: fec: Fix possible NPD in fec_enet_phy_reset_after_clk_enable()
| * 2f28d51c USB: serial: option: add Telit Cinterion LE910C4-WWX new compositions
| * b896501e USB: serial: option: add Telit Cinterion FN990A w/audio compositions
| * 931ee327 tty: hvc_console: Call hvc_kick in hvc_write unconditionally
| * 8016e5f1 mtd: nand: raw: atmel: Respect tAR, tCLR in read setup timing
| * d5c63211 mtd: nand: raw: atmel: Fix comment in timings preparation
| * dc1c6e60 mtd: rawnand: stm32_fmc2: avoid overlapping mappings on ECC buffer
| * b6590e47 mm/khugepaged: fix the address passed to notifier on testing young
| * 5c9f4471 fuse: prevent overflow in copy_file_range return value
| * 8d632766 fuse: check if copy_file_range() returns larger than requested size
| * 18630c36 mtd: rawnand: stm32_fmc2: fix ECC overwrite
| * 16e518ca ocfs2: fix recursive semaphore deadlock in fiemap call
| * c97018c8 EDAC/altera: Delete an inappropriate dma_free_coherent() call
| * 08f58d10 tcp_bpf: Call sk_msg_free() when tcp_bpf_send_verdict() fails to allocate psock->cork.
| * 85817feb NFSv4: Don't clear capabilities that won't be reset
| * 83083c5f net: Fix null-ptr-deref by sock_lock_init_class_and_name() and rmmod.
| * 6ddde3e4 usb: hub: Fix flushing of delayed work used for post resume purposes
* 42a4886a Merge android12-5.4 into android12-5.4-lts

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