Commit d0d935fb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge tag 'android12-5.10.230_r00' into android12-5.10



This merges up to the 5.10.230 LTS release into the android12-5.10
branch.  Changes included in here are:

* d8d2f8af Revert "spi: Fix deadlock when adding SPI controllers on SPI buses"
* 15cc9c0f Revert "spi: fix use-after-free of the add_lock mutex"
*   c7f25f3f Merge 5.10.230 into android12-5.10-lts
|\
| * 711d99f8 Linux 5.10.230
| * 91832699 9p: fix slab cache name creation for real
| * d0249286 mm: krealloc: Fix MTE false alarm in __do_krealloc
| * b17397a0 io_uring: fix possible deadlock in io_register_iowq_max_workers()
| * dd7a728d md/raid10: improve code of mrdev in raid10_sync_request
| * 8ea0b8e3 net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition
| * 9db25c2b fs: Fix uninitialized value issue in from_kuid and from_kgid
| * 35b4795a vDPA/ifcvf: Fix pci_read_config_byte() return code handling
| * 7e222d2c powerpc/powernv: Free name on error in opal_event_init()
| * b718f717 sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML
| * dc834af6 crypto: marvell/cesa - Disable hash algorithms
| * 4d8f6679 bpf: use kvzmalloc to allocate BPF verifier environment
| * 0bf6971b HID: multitouch: Add quirk for HONOR MagicBook Art 14 touchpad
| * 2bc339b0 9p: Avoid creating multiple slab caches with the same name
| * 2f4bfcc4 net: phy: ti: take into account all possible interrupt sources
| * 16a8ebc8 ALSA: usb-audio: Add endianness annotations
| * eb1bdcb7 vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
| * 414476c4 hv_sock: Initializing vsk->trans to NULL to prevent a dangling pointer
| * 0d71863c ALSA: usb-audio: Add quirks for Dell WD19 dock
| * 4dc9c1e8 ALSA: usb-audio: Support jack detection on Dell dock
| * 6a7e6dcf ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove()
| * e068a87c irqchip/gic-v3: Force propagation of the active state with a read-back
| * bb17f421 USB: serial: option: add Quectel RG650V
| * 6d5bd4bc USB: serial: option: add Fibocom FG132 0x0112 composition
| * c5748d95 USB: serial: qcserial: add support for Sierra Wireless EM86xx
| * e567fc8f USB: serial: io_edgeport: fix use after free in debug printk
| * d7692316 usb: typec: fix potential out of bounds in ucsi_ccg_update_set_new_cam_cmd()
| * 6e2848d1 usb: musb: sunxi: Fix accessing an released usb phy
| * 5dd3f5a9 fs/proc: fix compile warning about variable 'vmcore_mmap_ops'
| * faff5bbb media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format
| * 54708730 net: do not delay dst_entries_add() in dst_release()
| * 83aa0c99 perf session: Add missing evlist__delete when deleting a session
| * 2297d80a Revert "perf hist: Add missing puts to hist__account_cycles"
| * 82090f94 net: bridge: xmit: make sure we have at least eth header len bytes
| * 11eab327 spi: fix use-after-free of the add_lock mutex
| * c8dce228 spi: Fix deadlock when adding SPI controllers on SPI buses
| * 982a2757 splice: don't generate zero-len segement bvecs
| * bf0b0c6d btrfs: reinitialize delayed ref list after deleting it from the list
| * 8fc5ea92 nfs: Fix KMSAN warning in decode_getfattr_attrs()
| * 485d9232 io_uring/rw: fix missing NOWAIT check for O_DIRECT start write
| * f3366228 io_uring: use kiocb_{start,end}_write() helpers
| * f83a3235 fs: create kiocb_{start,end}_write() helpers
| * 955089c2 io_uring: rename kiocb_end_write() local helper
| * 6f383f65 dm-unstriped: cast an operand to sector_t to prevent potential uint32_t overflow
| * 483b7261 dm cache: fix potential out-of-bounds access on the first resume
| * f136d8d3 dm cache: optimize dirty bit checking with find_next_bit when resizing
| * ee1f7492 dm cache: fix out-of-bounds access to the dirty bitset when resizing
| * 5b975f14 dm cache: correct the number of origin blocks to match the target length
| * 2ac7f253 drm/amdgpu: prevent NULL pointer dereference if ATIF is not supported
| * 17f5f180 drm/amdgpu: add missing size check in amdgpu_debugfs_gprwave_read()
| * 1829c36f pwm: imx-tpm: Use correct MODULO value for EPWM mode
| * 054931ca media: v4l2-tpg: prevent the risk of a division by zero
| * 5a9bd375 media: pulse8-cec: fix data timestamp at pulse8_setup()
| * 828047c7 media: cx24116: prevent overflows on SNR calculus
| * f54e8e1e media: s5p-jpeg: prevent buffer overflows
| * 3a977b55 ASoC: stm32: spdifrx: fix dma channel release in stm32_spdifrx_remove
| * ac40b9df ALSA: firewire-lib: fix return value on fail in amdtp_tscm_init()
| * c1eba9f0 scsi: sd_zbc: Use kvzalloc() to allocate REPORT ZONES buffer
| * 8e823ce9 media: adv7604: prevent underflow condition when reporting colorspace
| * e351002b media: dvb_frontend: don't play tricks with underflow values
| * a4a17210 media: dvbdev: prevent the risk of out of memory access
| * ae6fd157 media: stb0899_algo: initialize cfr before using it
| * 63b122f5 Revert "ALSA: hda/conexant: Mute speakers at suspend / shutdown"
| * 30606ea3 net: arc: fix the device for dma_map_single/dma_unmap_single
| * 71d08334 net: phy: ti: add PHY_RST_AFTER_CLK_EN flag
| * d3f517f9 net: phy: ti: implement generic .handle_interrupt() callback
| * f398d0a5 net: phy: export phy_error and phy_trigger_machine
| * 590a4b2d net: hns3: fix kernel crash when uninstalling driver
| * cf6bae33 can: c_can: fix {rx,tx}_errors statistics
| * 40b283ba sctp: properly validate chunk size in sctp_sf_ootb()
| * 22f4e2f8 net: enetc: set MAC address to the VF net_device
| * 1e433258 security/keys: fix slab-out-of-bounds in key_task_permission
| * d7dc68d8 HID: core: zero-initialize the report buffer
| * 7830bfc3 ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin
| * 92f5b697 ARM: dts: rockchip: Fix the spi controller on rk3036
| * c34f7b90 ARM: dts: rockchip: drop grf reference from rk3036 hdmi
| * db87a9fb ARM: dts: rockchip: fix rk3036 acodec node
| * 7ddbc813 arm64: dts: imx8mp: correct sdhc ipg clk
| * e38f91b7 arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc
| * fbccf964 arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma lion
| * 752c5bfb arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards
| * ebb427d5 arm64: dts: rockchip: Remove hdmi's 2nd interrupt on rk3328
| * 9d0d15f2 arm64: dts: rockchip: Fix rt5651 compatible value on rk3399-sapphire-excavator
* | 979670a6 ANDROID: GKI: fix up crc symbols for some drm functions.
* | 021786a0 Merge 5.10.229 into android12-5.10-lts
|\|
| * b874a7e6 Linux 5.10.229
| * 7948c22c mac80211: always have ieee80211_sta_restart()
| * 1e5a17dc vt: prevent kernel-infoleak in con_font_get()
| * a508a102 drm/shmem-helper: Fix BUG_ON() on mmap(PROT_WRITE, MAP_PRIVATE)
| * 1d0d406b Revert "drm/mipi-dsi: Set the fwnode for mipi_dsi_device"
| * bda1a99a mm: shmem: fix data-race in shmem_getattr()
| * aa0cee46 nilfs2: fix kernel bug due to missing clearing of checked flag
| * bfd1d223 x86/bugs: Use code segment selector for VERW operand
| * 70767689 ocfs2: pass u64 to ocfs2_truncate_inline maybe overflow
| * d592b2e9 riscv: Remove duplicated GET_RM
| * 170ad7e7 riscv: Remove unused GENERATING_ASM_OFFSETS
| * 7e6bb344 riscv: Use '%u' to format the output of 'cpu'
| * 1e617230 riscv: efi: Set NX compat flag in PE/COFF header
| * c3457286 riscv: vdso: Prevent the compiler from inserting calls to memset()
| * 35770ca6 mm: avoid leaving partial pfn mappings around in error case
| * 69d4e1ce mm: add remap_pfn_range_notrack
| * c72e0df0 nilfs2: fix potential deadlock with newly created symlinks
| * edc84c1c iio: light: veml6030: fix microlux value calculation
| * 442f786c staging: iio: frequency: ad9832: fix division by zero in ad9832_calc_freqreg()
| * d0231f43 wifi: iwlegacy: Clear stale interrupts before resuming device
| * 4112450d wifi: ath10k: Fix memory leak in management tx
| * c21efba8 wifi: mac80211: do not pass a stopped vif to the driver in .get_txpower
| * 1cfc3293 Revert "driver core: Fix uevent_show() vs driver detach race"
| * 796df8d6 xhci: Use pm_runtime_get to prevent RPM on unsupported systems
| * 06578989 xhci: Fix Link TRB DMA in command ring stopped completion event
| * efefde4d usb: phy: Fix API devm_usb_put_phy() can not release the phy
| * 2d4650d2 usbip: tools: Fix detach_port() invalid port error path
| * 603342ab misc: sgi-gru: Don't disable preemption in GRU driver
| * aae9c5b4 NFS: remove revoked delegation from server's delegation list
| * 8395b609 net: amd: mvme147: Fix probe banner message
| * 0cac4a27 firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state()
| * 422f1b66 kasan: Fix Software Tag-Based KASAN with GCC
| * 8e99d418 compiler-gcc: remove attribute support check for `__no_sanitize_address__`
| * 4336f120 compiler-gcc: be consistent with underscores use for `no_sanitize`
| * e3e608cb netfilter: nft_payload: sanitize offset and length before calling skb_checksum()
| * a27a5c40 net: skip offload for NETIF_F_IPV6_CSUM if ipv6 header contains extension
| * b88262c9 net: support ip generic csum processing in skb_csum_hwoffload_help
| * 590976f9 bpf: Fix out-of-bounds write in trie_get_next_key()
| * ce691c81 net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
| * 9cab53f0 gtp: allow -1 to be specified as file description from userspace
| * e2742758 ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_init_flow()
| * 465d3a8e ASoC: cs42l51: Fix some error handling paths in cs42l51_probe()
| * 45a62891 wifi: iwlwifi: mvm: Fix response handling in iwl_mvm_send_recovery_cmd()
| * 66e35e42 wifi: iwlwifi: mvm: disconnect station vifs if recovery failed
| * 02b121be mac80211: Add support to trigger sta disconnect on hardware restart
| * 89e25a2e mac80211: do drv_reconfig_complete() before restarting all
| * 1ac988c6 RDMA/bnxt_re: synchronize the qp-handle table array
| * 8256f616 RDMA/mlx5: Round max_rd_atomic/max_dest_rd_atomic up instead of down
| * f121dee2 RDMA/cxgb4: Dump vendor specific QP details
| * 935ca968 wifi: brcm80211: BRCM_TRACING should depend on TRACING
| * fd3b3687 wifi: mac80211: skip non-uploaded keys in ieee80211_iter_keys
| * e38ccb22 mac80211: MAC80211_MESSAGE_TRACING should depend on TRACING
| * ffbb1f15 cgroup: Fix potential overflow issue when checking max_depth
| * 5b1e461f selftests/mm: fix incorrect buffer->mirror size in hmm2 double_map test
| * 8df5cd51 xfrm: validate new SA's prefixlen using SA family when sel.family is unset
| * 4abbba71 arm64/uprobes: change the uprobe_opcode_t typedef to fix the sparse warning
| * 03c9c2c2 ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe()
| * f4b6a649 net: phy: dp83822: Fix reset pin definitions
| * 2fe399bb serial: protect uart_port_dtr_rts() in uart_shutdown() too
| * 066314b0 selinux: improve error checking in sel_write_load()
| * 3eb6aa87 hv_netvsc: Fix VF namespace also in synthetic NIC NETDEV_REGISTER event
| * 631330f5 ALSA: hda/realtek: Add subwoofer quirk for Acer Predator G9-593
| * 76ce386f KVM: nSVM: Ignore nCR3[4:0] when loading PDPTEs from memory
| * 0f0374d0 openat2: explicitly return -E2BIG for (usize > PAGE_SIZE)
| * 9f2ab983 nilfs2: fix kernel bug due to missing clearing of buffer delay flag
| * 1f440403 ACPI: button: Add DMI quirk for Samsung Galaxy Book2 to fix initial lid detection issue
| * 59a1b38d ACPI: resource: Add LG 16T90SP to irq1_level_low_skip_override[]
| * 23468291 drm/amd: Guard against bad data for ATIF ACPI method
| * c9085e24 ALSA: hda/realtek: Update default depop procedure
| * 5e431f85 ALSA: firewire-lib: Avoid division by zero in apply_constraint_to_size()
| * c7fcfdba posix-clock: posix-clock: Fix unbalanced locking in pc_clock_settime()
| * 0da93d67 r8169: avoid unsolicited interrupts
| * 8a283a19 net: sched: fix use-after-free in taprio_change()
| * 95b3f3ed net: usb: usbnet: fix name regression
| * 77bc881d be2net: fix potential memory leak in be_xmit()
| * db755e55 net/sun3_82586: fix potential memory leak in sun3_82586_send_packet()
* | 9e7d6535 Merge 9f95de15 ("xfrm: respect ip protocols rules criteria when performing dst lookups") into android12-5.10-lts
|/
* 9f95de15 xfrm: respect ip protocols rules criteria when performing dst lookups
* 6ba07c4a xfrm: extract dst lookup parameters into a struct

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