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

Merge tag 'android14-6.1.124_r00' into android14-6.1



This merges the android14-6.1.124_r00 tag into the android14-6.1 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* e280ed49 Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context"
* 6a643e39 Revert "ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices"
* 528ab932 Revert "ip_tunnel: annotate data-races around t->parms.link"
* 02dc81da Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev()"
* 11a2f634 Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit()"
* 302342ed Revert "ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit()"
* 5713068b Revert "net: Fix netns for ip_tunnel_init_flow()"
* 50cda709 Revert "usb: xhci: Limit Stop Endpoint retries"
* 0ab35d88 Revert "xhci: Turn NEC specific quirk for handling Stop Endpoint errors generic"
*   4ff68760 Merge 6.1.124 into android14-6.1-lts
|\
| * c63962be Linux 6.1.124
| * 677294e4 zram: check comp is non-NULL before calling comp_destroy
| * 91b493f1 mptcp: don't always assume copied data in mptcp_cleanup_rbuf()
| * cbdb6a4c mptcp: fix recvbuffer adjust on sleeping rcvmsg
| * 09ba9532 mptcp: fix TCP options overflow.
| * bfb70119 mm: vmscan: account for free pages to prevent infinite Loop in throttle_direct_reclaim()
| * a3f8ee15 mm/readahead: fix large folio support in async readahead
| * 887890bb dt-bindings: display: adi,adv7533: Drop single lane support
| * e64d0a11 drm: adv7511: Drop dsi single lane support
| * 7af63ef5 net/sctp: Prevent autoclose integer overflow in sctp_association_init()
| * eef34c01 sky2: Add device ID 11ab:4373 for Marvell 88E8075
| * 0310cbad pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking
| * 346db03e RDMA/uverbs: Prevent integer overflow issue
| * 9e431c67 kcov: mark in_softirq_really() as __always_inline
| * cff1de87 ALSA: seq: oss: Fix races at processing SysEx messages
| * 12539ac4 ALSA hda/realtek: Add quirk for Framework F111:000C
| * 1f8da43e modpost: fix the missed iteration for the max bit in do_input()
| * 7635c2d7 modpost: fix input MODULE_DEVICE_TABLE() built for 64-bit on 32-bit host
| * b7350b18 usb: xhci: Avoid queuing redundant Stop Endpoint commands
| * 1164026a ARC: build: Try to guess GCC variant of cross compiler
| * 9336ec56 irqchip/gic: Correct declaration of *percpu_base pointer in union gic_base
| * 028a6888 Bluetooth: hci_core: Fix sleeping function called from invalid context
| * 31dc29b5 net: usb: qmi_wwan: add Telit FE910C04 compositions
| * ca2c565a ksmbd: retry iterate_dir in smb2_query_dir
| * 42de6037 bpf: fix potential error return
| * ced1bd92 sound: usb: format: don't warn that raw DSD is unsupported
| * 7881f1b3 sound: usb: enable DSD output for ddHiFi TC44C
| * 78159582 ALSA: hda/realtek: Add new alc2xx-fixup-headset-mic model
| * 1ea629e7 btrfs: flush delalloc workers queue before stopping cleaner kthread during unmount
| * 465b18e1 drm/amdkfd: Correct the migration DMA map direction
| * c217d67b wifi: mac80211: wake the queues in case of failure in resume
| * 66376f1a btrfs: fix use-after-free when COWing tree bock and tracing is enabled
| * 9caa2079 btrfs: rename and export __btrfs_cow_block()
| * eba25e21 ila: serialize calls to nf_register_net_hooks()
| * 5d336714 af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK
| * d91b4a9b af_packet: fix vlan_get_tci() vs MSG_PEEK
| * 81d26fee net: wwan: iosm: Properly check for valid exec stage in ipc_mmio_init()
| * ad2ad4cd net: restrict SO_REUSEPORT to inet sockets
| * ac9cfef6 net: reenable NETIF_F_IPV6_CSUM offload for BIG TCP packets
| * 32e1e748 RDMA/rtrs: Ensure 'ib_sge list' is accessible
| * b8ab9bd0 net: wwan: t7xx: Fix FSM command timeout issue
| * 274cb294 net: mv643xx_eth: fix an OF node reference leak
| * 847c4daa eth: bcmsysport: fix call balance of priv->clk handling routines
| * 956f00d8 ALSA: usb-audio: US16x08: Initialize array before use
| * 94dde4fd net: llc: reset skb->transport_header
| * 607774a1 netfilter: nft_set_hash: unaligned atomic read on struct nft_set_ext
| * 3f1f094e drm/i915/dg1: Fix power gate sequence.
| * 78a11033 netrom: check buffer length before accessing it
| * d4b3978f net: Fix netns for ip_tunnel_init_flow()
| * 9b8f85c4 ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit()
| * d6ff1c86 ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit()
| * 5fb41d9b ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev()
| * c3c53b16 ip_tunnel: annotate data-races around t->parms.link
| * 19bbca7b ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices
| * de3f999b net: fix memory leak in tcp_conn_request()
| * 28f1e04d net: stmmac: restructure the error path of stmmac_probe_config_dt()
| * 51c8cfd0 net: stmmac: don't create a MDIO bus if unnecessary
| * 40b78dbd net: stmmac: platform: provide devm_stmmac_probe_config_dt()
| * b46cff87 RDMA/hns: Fix missing flush CQE for DWQE
| * 3f0a3e85 RDMA/hns: Fix warning storm caused by invalid input in IO path
| * 5a824c30 RDMA/hns: Fix mapping error of zero-hop WQE buffer
| * b32e9f4a RDMA/hns: Remove unused parameters and variables
| * 8e16c8b4 RDMA/hns: Refactor mtr find
| * ba401427 net: dsa: microchip: Fix LAN937X set_ageing_time function
| * 9d00ab0e net: dsa: microchip: add ksz_rmw8() function
| * f7954e85 net: dsa: microchip: Fix KSZ9477 set_ageing_time function
| * 24789601 drm/bridge: adv7511_audio: Update Audio InfoFrame properly
| * 02c46a2d RDMA/bnxt_re: Fix the locking while accessing the QP table
| * 1dcaac7a RDMA/bnxt_re: Fix max_qp_wrs reported
| * c68c1366 RDMA/bnxt_re: Fix reporting hw_ver in query_device
| * c50ff899 RDMA/bnxt_re: Add check for path mtu in modify_qp
| * cbc35242 RDMA/mlx5: Enforce same type port association for multiport RoCE
| * 6c6f477f net: mctp: handle skb cleanup on sock_queue failures
| * 116b937e xhci: Turn NEC specific quirk for handling Stop Endpoint errors generic
| * ae1a0885 usb: xhci: Limit Stop Endpoint retries
| * 1ae96fb8 xhci: retry Stop Endpoint on buggy NEC controllers
| * 326147e4 thunderbolt: Don't display nvm_version unless upgrade supported
| * 61674773 thunderbolt: Add support for Intel Panther Lake-M/P
| * f26009a0 thunderbolt: Add support for Intel Lunar Lake
| * 631b1e09 tracing: Have process_string() also allow arrays
| * a40de033 btrfs: fix use-after-free in btrfs_encoded_read_endio()
| * c79324d4 selinux: ignore unknown extended permissions
| * 16fea758 x86/hyperv: Fix hv tsc page based sched_clock for hibernation
* | 2e60b675 ANDROID: GKI: add blk_mq_quiesce_queue_nowait to virtual_device build symbol list
* | 7d8965fd Revert "tracing: Constify string literal data member in struct trace_event_call"
* | 51d8dc4e Merge 6.1.123 into android14-6.1-lts
|\|
| * 7dc732d2 Linux 6.1.123
| * 1599e0fa ALSA: hda/realtek: Fix spelling mistake "Firelfy" -> "Firefly"
| * acddb876 Revert "rcu-tasks: Fix access non-existent percpu rtpcp variable in rcu_tasks_need_gpcb()"
| * 36775f42 nfsd: cancel nfsd_shrinker_work using sync mode in nfs4_state_shutdown_net
| * 459ef4a2 btrfs: sysfs: fix direct super block member reads
| * bb8e287f btrfs: avoid monopolizing a core when activating a swap file
| * 6abbbd82 power: supply: gpio-charger: Fix set charge current limits
| * 990730dd i2c: microchip-core: fix "ghost" detections
| * b106ced6 i2c: imx: add imx7d compatible string for applying erratum ERR007805
| * 906fb746 i2c: microchip-core: actually use repeated sends
| * 62373313 io_uring/sqpoll: fix sqpoll error handling races
| * 3d15f4c2 tracing: Prevent bad count for tracing_cpumask_write
| * f2a16d2b tracing: Constify string literal data member in struct trace_event_call
| * 581d8a5a freezer, sched: Report frozen tasks as 'D' instead of 'R'
| * b0ce4e8f sched/core: Report correct state for TASK_IDLE | TASK_FREEZABLE
| * da719022 pmdomain: core: Add missing put_device()
| * 10d40c46 ALSA: hda/realtek: fix micmute LEDs don't work on HP Laptops
| * 8fb5edd2 ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook X G1i
| * 4e8074bb bpf: Check validity of link->type in bpf_link_show_fdinfo()
| * db84cb4c net/mlx5e: Don't call cleanup on profile rollback failure
| * 7b937282 MIPS: mipsregs: Set proper ISA level for virt extensions
| * b016bb8f MIPS: Probe toolchain support of -msym32
| * 53e04920 vmalloc: fix accounting with i915
| * 45883477 blk-mq: register cpuhp callback after hctx is added to xarray table
| * 9e323f85 virtio-blk: don't keep queue frozen during system suspend
| * f61b2e5e drm/dp_mst: Ensure mst_primary pointer is valid in drm_dp_mst_handle_up_req()
| * ade7aeb0 scsi: storvsc: Do not flag MAINTENANCE_IN return of SRB_STATUS_DATA_OVERRUN as an error
| * 47c629d3 scsi: mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during driver load time
| * ba3c9016 platform/x86: asus-nb-wmi: Ignore unknown event 0xCF
| * 048abad5 regmap: Use correct format specifier for logging range errors
| * 2ea605f6 smb: server: Fix building with GCC 15
| * 385c4fdb ALSA: hda/conexant: fix Z60MR100 startup pop issue
| * edadc693 scsi: megaraid_sas: Fix for a potential deadlock
| * 7aafb0c4 scsi: qla1280: Fix hw revision numbering for ISP1020/1040
| * e53deb6f watchdog: it87_wdt: add PWRGD enable quirk for Qotom QCML04
| * 83f5ba09 tracing/kprobe: Make trace_kprobe's module callback called after jump_label update
| * 7357ad7d stddef: make __struct_group() UAPI C++-friendly
| * 8b2282b5 powerpc/pseries/vas: Add close() callback in vas_vm_ops struct
| * 6ea15205 mtd: rawnand: fix double free in atmel_pmecc_create_user()
| * fdba6d5e dmaengine: at_xdmac: avoid null_prt_deref in at_xdmac_prep_dma_memset
| * f03e6bb3 dmaengine: apple-admac: Avoid accessing registers in probe
| * c2610aba dmaengine: tegra: Return correct DMA status when paused
| * e1f1aa97 dmaengine: dw: Select only supported masters for ACPI devices
| * 341be7bd dmaengine: mv_xor: fix child node refcount handling in early exit
| * eb71df41 phy: rockchip: naneng-combphy: fix phy reset
| * a19b5055 phy: usb: Toggle the PHY power during init
| * 8c6ef358 phy: core: Fix that API devm_phy_destroy() fails to destroy the phy
| * 0f46864e phy: core: Fix that API devm_of_phy_provider_unregister() fails to unregister the phy provider
| * 5c23b6b4 phy: core: Fix that API devm_phy_put() fails to release the phy
| * be2c737d phy: core: Fix an OF node refcount leakage in of_phy_provider_lookup()
| * dff39743 phy: core: Fix an OF node refcount leakage in _of_phy_get()
| * 138a5c77 phy: qcom-qmp: Fix register name in RX Lane config of SC8280XP
| * aeace7d4 mtd: rawnand: arasan: Fix missing de-registration of NAND
| * b4b49cbd mtd: rawnand: arasan: Fix double assertion of chip-select
| * eabe5f73 mtd: diskonchip: Cast an operand to prevent potential overflow
| * 61ddaac4 nfsd: restore callback functionality for NFSv4.0
| * 9a57119d bpf: Check negative offsets in __bpf_skb_min_len()
| * be848bde tcp_bpf: Add sk_rmem_alloc related logic for tcp_bpf ingress redirection
| * 2a572e30 tcp_bpf: Charge receive socket buffer in bpf_tcp_ingress()
| * b480e57d mm/vmstat: fix a W=1 clang compiler warning
| * 3876e3a1 media: dvb-frontends: dib3000mb: fix uninit-value in dib3000_write_reg
* | 7ec8f74d Merge 6.1.122 into android14-6.1-lts
|/
* 563edd78 Linux 6.1.122
* bd050bb5 drm/amdgpu: Handle NULL bo->tbo.resource (again) in amdgpu_vm_bo_update
* 71a7e2f5 io_uring/rw: avoid punting to io-wq directly
* 57cd0416 io_uring/rw: treat -EOPNOTSUPP for IOCB_NOWAIT like -EAGAIN
* 72060434 io_uring/rw: split io_read() into a helper
* 400a2ae6 epoll: Add synchronous wakeup support for ep_poll_callback
* 6c450489 udf: Fix directory iteration for longer tail extents
* 91542d13 ceph: validate snapdirname option length when mounting
* 28ca6f1d of: Fix refcount leakage for OF node returned by __of_get_dma_parent()
* 76db8a75 of: Fix error path in of_parse_phandle_with_args_map()
* 4fa2c639 udmabuf: also check for F_SEAL_FUTURE_WRITE
* ef942d23 nilfs2: prevent use of deleted inode
* 48d2fb14 nilfs2: fix buffer head leaks in calls to truncate_inode_pages()
* 4c300be8 of/irq: Fix using uninitialized variable @addr_len in API of_irq_parse_one()
* cd126daa of/irq: Fix interrupt-map cell length check in of_irq_parse_imap_parent()
* 61f3036b NFS/pnfs: Fix a live lock between recalled layouts and layoutget
* 534d59ab io_uring: check if iowq is killed before queuing
* c034ce26 io_uring: Fix registered ring file refcount leak
* 48d07e3a selftests/bpf: Use asm constraint "m" for LoongArch
* f3ff759e tracing: Add "%s" check in test_event_printk()
* 5a03ebbe tracing: Add missing helper functions in event pointer dereference check
* ce8d3631 tracing: Fix test_event_printk() to process entire print argument
* 7ed4db31 KVM: x86: Play nice with protected guests in complete_hypercall_exit()
* 718fe694 Drivers: hv: util: Avoid accessing a ringbuffer not initialized yet
* 0323e6b1 btrfs: tree-checker: reject inline extent items with 0 ref count
* ac3b5366 zram: fix uninitialized ZRAM not releasing backing device
* b9ca6cf4 zram: refuse to use zero sized block device as backing device
* 2d9a4ff1 sh: clk: Fix clk_enable() to return 0 on NULL clk
* a8a1a794 hwmon: (tmp513) Fix interpretation of values of Temperature Result and Limit Registers
* 51f81082 hwmon: (tmp513) Fix Current Register value interpretation
* 8e58bf4a hwmon: (tmp513) Fix interpretation of values of Shunt Voltage and Limit Registers
* 11fa4e17 hwmon: (tmp513) Use SI constants from units.h
* 7df25973 hwmon: (tmp513) Simplify with dev_err_probe()
* d2aa3d50 hwmon: (tmp513) Don't use "proxy" headers
* 65501a4f drm/amdgpu: don't access invalid sched
* c7fe4305 i915/guc: Accumulate active runtime on gt reset
* 7bfe589b i915/guc: Ensure busyness counter increases motonically
* 7966c6ed i915/guc: Reset engine utilization buffer before registration
* 1e9307c9 drm/panel: novatek-nt35950: fix return value check in nt35950_probe()
* 69fbb01e drm/modes: Avoid divide by zero harder in drm_mode_vrefresh()
* a3301461 thunderbolt: Improve redrive mode handling
* b540c716 USB: serial: option: add Telit FE910C04 rmnet compositions
* 12b2347d USB: serial: option: add MediaTek T7XX compositions
* a81a361b USB: serial: option: add Netprisma LCUK54 modules for WWAN Ready
* 32740154 USB: serial: option: add MeiG Smart SLM770A
* 1f76595c USB: serial: option: add TCL IK512 MBIM & ECM
* d7205a72 hexagon: Disable constant extender optimization for LLVM prior to 19.1.0
* ab765320 efivarfs: Fix error on non-existent file
* a72ff366 i2c: riic: Always round-up when calculating bus period
* ecc0e323 chelsio/chtls: prevent potential integer overflow on 32bit
* 15b3121a KVM: x86: Cache CPUID.0xD XSTATE offsets+sizes during module init
* f1dec8bc mmc: sdhci-tegra: Remove SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC quirk
* 26429dc6 net: mdiobus: fix an OF node reference leak
* 7134f637 netfilter: ipset: Fix for recursive locking warning
* 2d5b7d2c net: ethernet: bgmac-platform: fix an OF node reference leak
* e6fc9ff9 net: hinic: Fix cleanup in create_rxqs/txqs()
* 11561dfe ionic: use ee->offset when returning sprom data
* da93a128 ionic: Fix netdev notifier unregister on failure
* d10321be netdevsim: prevent bad user input in nsim_dev_health_break_write()
* 59c4ca8d net: mscc: ocelot: fix incorrect IFH SRC_PORT field in ocelot_ifh_set_basic()
* d7d1f986 net/smc: check return value of sock_recvmsg when draining clc data
* e1cc8be2 net/smc: check smcd_v2_ext_offset when receiving proposal msg
* 62056d15 net/smc: check iparea_offset and ipv6_prefixes_cnt when receiving proposal msg
* a76434c8 net/smc: check sndbuf_space again after NOSPACE flag is set in smc_poll
* bec2f528 net/smc: protect link down work from execute after lgr freed
* 7334f371 cxl/region: Fix region creation for greater than x2 switches
* 2dfa38be i2c: pnx: Fix timeout in wait functions
* 090cd7df p2sb: Do not scan and remove the P2SB device when it is unhidden
* 8fc1667b p2sb: Move P2SB hide and unhide code to p2sb_scan_and_cache()
* d552e2e0 p2sb: Introduce the global flag p2sb_hidden_by_bios
* da3d454c p2sb: Factor out p2sb_read_from_cache()
* 1e41911a platform/x86: p2sb: Make p2sb_get_devfn() return void
* 45bbb2a6 PCI: Introduce pci_resource_n()
* 684e2601 usb: dwc2: gadget: Don't write invalid mapped sg entries into dma_desc with iommu enabled
* 3469c3e3 MIPS: Loongson64: DTS: Fix msi node for ls7a
* f6720b13 PCI: Add ACS quirk for Broadcom BCM5760X NIC
* 626b6fc9 ASoC: Intel: sof_sdw: add quirk for Dell SKU 0B8C
* 0aeb5803 ASoC: Intel: sof_sdw: fix jack detection on ADL-N variant RVP
* 498e9f29 usb: cdns3: Add quirk flag to enable suspend residency
* ee986496 PCI: vmd: Create domain symlink before pci_bus_add_devices()
* f858b0fa PCI: Use preserve_config in place of pci_flags
* 9906dbe6 PCI/AER: Disable AER service on suspend
* 489422e2 net: sched: fix ordering of qlen adjustment

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