Skip to content

Commit 9d24229

Browse files
committed
Merge tag 'v6.1.142' into orange-pi-6.1-rk35xx
This is the 6.1.142 stable release * tag 'v6.1.142' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.142 RISC-V: KVM: Don't treat SBI HFENCE calls as NOPs RISC-V: KVM: Fix the size parameter check in SBI SFENCE calls scsi: elx: efct: Fix memory leak in efct_hw_parse_filter() arm64/ptrace: Fix stack-out-of-bounds read in regs_get_kernel_stack_nth() perf: Fix sample vs do_exit() s390/pci: Fix __pcilg_mio_inuser() inline assembly platform/loongarch: laptop: Add backlight power control support smb: client: fix first command failure during re-negotiation Revert "cpufreq: tegra186: Share policy per cluster" serial: sh-sci: Increment the runtime usage counter for the earlycon device arm64: dts: imx8mm: Drop sd-vsel-gpios from i.MX8M Mini Verdin SoM arm64: dts: ti: k3-j721e-sk: Add DT nodes for power regulators ARM: dts: am335x-bone-common: Increase MDIO reset deassert delay to 50ms ARM: dts: am335x-bone-common: Increase MDIO reset deassert time ARM: dts: am335x-bone-common: Add GPIO PHY reset on revision C3 board platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties net: atm: fix /proc/net/atm/lec handling net: atm: add lec_mutex calipso: Fix null-ptr-deref in calipso_req_{set,del}attr(). net: lan743x: fix potential out-of-bounds write in lan743x_ptp_io_event_clock_get() net: microchip: lan743x: Reduce PTP timeout on HW failure tcp: fix passive TFO socket having invalid NAPI ID tipc: fix null-ptr-deref when acquiring remote ip of ethernet bearer tcp: fix tcp_packet_delayed() for tcp_is_non_sack_preventing_reopen() behavior atm: atmtcp: Free invalid length skb in atmtcp_c_send(). mpls: Use rcu_dereference_rtnl() in mpls_route_input_rcu(). wifi: carl9170: do not ping device which has failed to load firmware ptp: allow reading of currently dialed frequency to succeed on free-running clocks ptp: fix breakage after ptp_vclock_in_use() rework net: ice: Perform accurate aRFS flow match aoe: clean device rq_list in aoedev_downdev() pldmfw: Select CRC32 when PLDMFW is selected hwmon: (occ) fix unaligned accesses hwmon: (occ) Rework attribute registration for stack usage drm/nouveau/bl: increase buffer size to avoid truncate warning ionic: Prevent driver/fw getting out of sync on devcmd(s) drm/msm/dsi/dsi_phy_10nm: Fix missing initial VCO rate drm/msm/disp: Correct porch timing for SDM845 erofs: remove unused trace event erofs_destroy_inode bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE net: Fix checksum update for ILA adj-transport mm/huge_memory: fix dereferencing invalid pmd migration entry mm/hugetlb: fix huge_pmd_unshare() vs GUP-fast race mm: hugetlb: independent PMD page table shared count mm/hugetlb: unshare page tables during VMA split, not before iio: accel: fxls8962af: Fix temperature calculation ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged ALSA: hda/intel: Add Thinkpad E15 to PM deny list ALSA: usb-audio: Rename ALSA kcontrol PCM and PCM1 for the KTMicro sound card wifi: cfg80211: init wiphy_work before allocating rfkill fails Input: sparcspkr - avoid unannotated fall-through atm: Revert atm_account_tx() if copy_from_iter_full() fails. selinux: fix selinux_xfrm_alloc_user() to set correct ctx_len ksmbd: fix null pointer dereference in destroy_previous_session selftests/x86: Add a test to detect infinite SIGTRAP handler loop udmabuf: use sgtable-based scatterlist wrappers net_sched: sch_sfq: reject invalid perturb period scsi: s390: zfcp: Ensure synchronous unit_add scsi: storvsc: Increase the timeouts to storvsc_timeout smb: improve directory cache reuse for readdir operations jffs2: check jffs2_prealloc_raw_node_refs() result in few other places jffs2: check that raw node were preallocated before writing summary LoongArch: Avoid using $r0/$r1 as "mask" for csrxchg platform/loongarch: laptop: Unregister generic_sub_drivers on exit platform/loongarch: laptop: Get brightness setting from EC on probe drivers/rapidio/rio_cm.c: prevent possible heap overwrite Revert "x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2" on v6.6 and older powerpc/eeh: Fix missing PE bridge reconfiguration during VFIO EEH recovery platform/x86: dell_rbu: Stop overwriting data buffer platform/x86: dell_rbu: Fix list usage Revert "bus: ti-sysc: Probe for l4_wkup and l4_cfg interconnect devices first" tee: Prevent size calculation wraparound on 32-bit kernels ARM: OMAP2+: Fix l4ls clk domain handling in STANDBY bus: fsl-mc: increase MC_CMD_COMPLETION_TIMEOUT_MS value watchdog: da9052_wdt: respect TWDMIN fbcon: Make sure modelist not set on unregistered console octeontx2-pf: Add error log forcn10k_map_unmap_rq_policer() net: ethernet: cortina: Use TOE/TSO on all TCP bpf, sockmap: Fix data lost during EAGAIN retries ice: fix check for existing switch rule i40e: fix MMIO write access to an invalid page in i40e_clear_hw sock: Correct error checking condition for (assign|release)_proto_idx() scsi: lpfc: Use memcpy() for BIOS version pinctrl: mcp23s08: Reset all pins to input at probe software node: Correct a OOB check in software_node_get_reference_args() vxlan: Do not treat dst cache initialization errors as fatal net: bridge: mcast: re-implement br_multicast_{enable, disable}_port functions net: bridge: mcast: update multicast contex when vlan state is changed wifi: mac80211_hwsim: Prevent tsf from setting if beacon is disabled iommu/amd: Ensure GA log notifier callbacks finish running before module unload scsi: lpfc: Fix lpfc_check_sli_ndlp() handling for GEN_REQUEST64 commands libbpf: Add identical pointer detection to btf_dedup_is_equiv() clk: rockchip: rk3036: mark ddrphy as critical wifi: mac80211: do not offer a mesh path if forwarding is disabled wireless: purelifi: plfxlc: fix memory leak in plfxlc_usb_wreq_asyn() net: vertexcom: mse102x: Return code for mse102x_rx_pkt_spi net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get() pinctrl: armada-37xx: propagate error from armada_37xx_pmx_gpio_set_direction() pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get_direction() pinctrl: armada-37xx: propagate error from armada_37xx_pmx_set_by_name() net: atlantic: generate software timestamp just before the doorbell ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT x86/sgx: Prevent attempts to reclaim poisoned pages tcp: fix initial tp->rcvq_space.space value for passive TS enabled flows tcp: always seek for minimal rtt in tcp_rcv_rtt_update() wifi: ath11k: Fix QMI memory reuse logic net: dlink: add synchronization for stats update i2c: npcm: Add clock toggle recovery i2c: tegra: check msg length in SMBUS block read cpufreq: scmi: Skip SCMI devices that aren't used by the CPUs sctp: Do not wake readers in __sctp_write_space() wifi: mt76: mt7921: add 160 MHz AP for mt7922 device wifi: mt76: mt76x2: Add support for LiteOn WN4516R,WN4519R emulex/benet: correct command version selection in be_cmd_get_stats() i2c: designware: Invoke runtime suspend on quick slave re-registration bpf: Check rcu_read_lock_trace_held() in bpf_map_lookup_percpu_elem() tipc: use kfree_sensitive() for aead cleanup net: lan743x: Modify the EEPROM and OTP size for PCI1xxxx devices net: macb: Check return value of dma_set_mask_and_coherent() ACPI: battery: negate current when discharging PM: runtime: fix denying of auto suspend in pm_suspend_timer_fn() ASoC: tegra210_ahub: Add check to of_device_get_match_data() ACPICA: utilities: Fix overflow check in vsnprintf() power: supply: bq27xxx: Retrieve again when busy ACPICA: fix acpi parse and parseext cache leaks ACPI: bus: Bail out if acpi_kobj registration fails ASoC: tas2770: Power cycle amp on ISENSE/VSENSE change ACPICA: Avoid sequence overread in call to strncmp() mmc: Add quirk to disable DDR50 tuning clocksource: Fix the CPUs' choice in the watchdog per CPU verification ASoC: amd: yc: Add quirk for Lenovo Yoga Pro 7 14ASP9 ACPICA: fix acpi operand cache leak in dswstate.c iio: adc: ad7606_spi: fix reg write value mask iio: imu: inv_icm42600: Fix temperature calculation iio: accel: fxls8962af: Fix temperature scan element sign PCI: dw-rockchip: Fix PHY function call sequence in rockchip_pcie_phy_deinit() PCI: Fix lock symmetry in pci_slot_unlock() PCI: Add ACS quirk for Loongson PCIe PCI: cadence-ep: Correct PBA offset in .set_msix() callback uio_hv_generic: Use correct size for interrupt and monitor pages cifs: reset connections for all channels when reconnect requested remoteproc: core: Release rproc->clean_table after rproc_attach() fails remoteproc: core: Cleanup acquired resources when rproc_handle_resources() fails in rproc_attach() regulator: max14577: Add error check for max14577_read_reg() mips: Add -std= flag specified in KBUILD_CFLAGS to vdso CFLAGS staging: iio: ad5933: Correct settling cycles encoding per datasheet KVM: s390: rename PROT_NONE to PROT_TYPE_DUMMY net: ch9200: fix uninitialised access during mii_nway_restart ftrace: Fix UAF when lookup kallsym after ftrace disabled dm-mirror: fix a tiny race condition KVM: SVM: Clear current_vmcb during vCPU free for all *possible* CPUs mtd: nand: sunxi: Add randomizer configuration before randomizer enable mtd: rawnand: sunxi: Add randomizer configuration in sunxi_nfc_hw_ecc_write_chunk mm: fix ratelimit_pages update error in dirty_ratio_handler() RDMA/iwcm: Fix use-after-free of work objects after cm_id destruction ipc: fix to protect IPCS lookups using RCU clk: meson-g12a: add missing fclk_div2 to spicc parisc: fix building with gcc-15 vgacon: Add check for vc_origin address range in vgacon_scroll() parisc/unaligned: Fix hex output to show 8 hex chars fbdev: Fix fb_set_var to prevent null-ptr-deref in fb_videomode_to_var EDAC/altera: Use correct write width with the INTTEST register net: ftgmac100: select FIXED_PHY NFC: nci: uart: Set tty->disc_data only in success path f2fs: fix to do sanity check on sit_bitmap_size f2fs: prevent kernel warning due to negative i_nlink from corrupted image Input: gpio-keys - fix possible concurrent access in gpio_keys_irq_timer() Input: ims-pcu - check record size in ims_pcu_flash_firmware() ext4: ensure i_size is smaller than maxbytes ext4: factor out ext4_get_maxbytes() ext4: fix calculation of credits for extent tree modification ext4: inline: fix len overflow in ext4_prepare_inline_data bus: fsl-mc: fix GET/SET_TAILDROP command ids bus: fsl-mc: do not add a device-link for the UAPI used DPMCP device ata: pata_via: Force PIO for ATAPI devices on VT6415/VT6330 cgroup,freezer: fix incomplete freezing when attaching tasks ceph: set superblock s_magic for IMA fsmagic matching can: tcan4x5x: fix power regulator retrieval during probe bus: mhi: host: Fix conflict between power_up and SYSERR ARM: omap: pmic-cpcap: do not mess around without CPCAP or OMAP4 ARM: 9447/1: arm/memremap: fix arch_memremap_can_ram_remap() media: uvcvideo: Fix deferred probing error media: uvcvideo: Send control events for partial succeeds media: uvcvideo: Return the number of processed controls media: imx-jpeg: Drop the first error frames media: vivid: Change the siize of the composing media: vidtv: Terminating the subsequent process of initialization failure media: videobuf2: use sgtable-based scatterlist wrappers media: venus: Fix probe error handling media: v4l2-dev: fix error handling in __video_register_device() media: omap3isp: use sgtable-based scatterlist wrappers media: gspca: Add error handling for stv06xx_read_sensor() media: davinci: vpif: Fix memory leak in probe error path media: cxusb: no longer judge rbuf when the write fails media: ccs-pll: Check for too high VT PLL multiplier in dual PLL case media: ccs-pll: Correct the upper limit of maximum op_pre_pll_clk_div media: ccs-pll: Start OP pre-PLL multiplier search from correct value media: ccs-pll: Start VT pre-PLL multiplier search from correct value media: ov8856: suppress probe deferral errors wifi: rtlwifi: disable ASPM for RTL8723BE with subsystem ID 11ad:1723 jbd2: fix data-race and null-ptr-deref in jbd2_journal_dirty_metadata() nfsd: Initialize ssc before laundromat_work to prevent NULL dereference nfsd: nfsd4_spo_must_allow() must check this is a v4 compound request wifi: ath11k: fix ring-buffer corruption wifi: ath11k: fix rx completion meta data corruption wifi: p54: prevent buffer-overflow in p54_rx_eeprom_readback() net/mlx5: Add error handling in mlx5_query_nic_vport_node_guid() net/mlx5_core: Add error handling inmlx5_query_nic_vport_qkey_viol_cntr() regulator: max20086: Change enable gpio to optional regulator: max20086: Fix MAX200086 chip id powerpc/pseries/msi: Avoid reading PCI device registers in reduced power states io_uring: account drain memory to cgroup ASoC: meson: meson-card-utils: use of_property_present() for DT parsing ASoC: qcom: sdm845: Add error handling in sdm845_slim_snd_hw_params() gfs2: move msleep to sleepable context crypto: marvell/cesa - Do not chain submitted requests configfs: Do not override creating attribute file failure in populate_attrs() kbuild: hdrcheck: fix cross build with clang kbuild: userprogs: fix bitsize and target detection on clang drm/meson: Use 1000ULL when operating with mode->clock net: usb: aqc111: debug info before sanitation calipso: unlock rcu before returning -EAFNOSUPPORT x86/iopl: Cure TIF_IO_BITMAP inconsistencies xen/arm: call uaccess_ttbr0_enable for dm_op hypercall usb: typec: tcpm/tcpci_maxim: Fix bounds check in process_rx() usb: Flush altsetting 0 endpoints before reinitializating them after reset. usb: cdnsp: Fix issue with detecting USB 3.2 speed usb: cdnsp: Fix issue with detecting command completion event VMCI: fix race between vmci_host_setup_notify and vmci_ctx_unset_notify usb: usbtmc: Fix read_stb function and get_stb ioctl kbuild: Add KBUILD_CPPFLAGS to as-option invocation kbuild: add $(CLANG_FLAGS) to KBUILD_CPPFLAGS kbuild: Add CLANG_FLAGS to as-instr mips: Include KBUILD_CPPFLAGS in CHECKFLAGS invocation drm/amd/display: Do not add '-mhard-float' to dml_ccflags for clang posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del() Revert "io_uring: ensure deferred completions are posted for multishot" HID: usbhid: Eliminate recurrent out-of-bounds bug in usbhid_parse() ALSA: usb-audio: Add implicit feedback quirk for RODE AI-1 tools/resolve_btfids: Fix build when cross compiling kernel with clang. bio: Fix bio_first_folio() for SPARSEMEM without VMEMMAP perf: Ensure bpf_perf_link path is properly serialized nvmet-fcloop: access fcpreq only when holding reqlock fs/filesystems: Fix potential unsigned integer underflow in fs_name() net_sched: ets: fix a race in ets_qdisc_change() net_sched: tbf: fix a race in tbf_change() net_sched: red: fix a race in __red_change() net_sched: prio: fix a race in prio_tune() net/mlx5e: Fix leak of Geneve TLV option object net/mlx5: Fix return value when searching for existing flow group net/mlx5: Ensure fw pages are always allocated on same NUMA Bluetooth: MGMT: Fix sparse errors Bluetooth: hci_sync: Fix broadcast/PA when using an existing instance Bluetooth: Fix NULL pointer deference on eir_get_service_data net/mdiobus: Fix potential out-of-bounds read/write access net: mdio: C22 is now optional, EOPNOTSUPP if not provided macsec: MACsec SCI assignment for ES = 0 net: Fix TOCTOU issue in sk_is_readable() ACPI: CPPC: Fix NULL pointer dereference when nosmp is used i40e: retry VFLR handling if there is ongoing VF reset i40e: return false from i40e_reset_vf if reset is in progress drm/meson: fix more rounding issues with 59.94Hz modes drm/meson: use vclk_freq instead of pixel_freq in debug print drm/meson: fix debug log statement when setting the HDMI clocks drm/meson: use unsigned long long / Hz for frequency types powerpc/vas: Return -EINVAL if the offset is non-zero in mmap() powerpc/powernv/memtrace: Fix out of bounds issue in memtrace mmap net_sched: sch_sfq: fix a potential crash on gso_skb handling scsi: iscsi: Fix incorrect error path labels for flashnode operations pinctrl: qcom: pinctrl-qcm2290: Add missing pins regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt() wifi: ath11k: validate ath11k_crypto_mode on top of ath11k_core_qmi_firmware_ready wifi: ath11k: don't wait when there is no vdev started wifi: ath11k: don't use static variables in ath11k_debugfs_fw_stats_process() wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request() wifi: ath11k: convert timeouts to secs_to_jiffies() wifi: ath11k: fix soc_dp_stats debugfs file permission wifi: ath11k: remove unused function ath11k_tm_event_wmi() ath10k: snoc: fix unbalanced IRQ enable in crash recovery ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use() Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete Bluetooth: hci_core: fix list_for_each_entry_rcu usage scsi: core: ufs: Fix a hang in the error handler serial: sh-sci: Clean sci_ports[0] after at earlycon exit serial: sh-sci: Move runtime PM enable to sci_probe_single() serial: sh-sci: Check if TX data was written to device in .tx_empty() arm64: dts: ti: k3-am65-main: Add missing taps to sdhci0 arm64: dts: ti: k3-am65-main: Fix sdhci node properties arm64: dts: ti: k3-am65-main: Drop deprecated ti,otap-del-sel property Input: synaptics-rmi - fix crash with unsupported versions of F34 arm64: dts: marvell: uDPU: define pinctrl state for alarm LEDs pmdomain: core: Fix error checking in genpd_dev_pm_attach_by_id() xfs: reset rootdir extent size hint after growfsrt xfs: take m_growlock when running growfsrt xfs: use XFS_BUF_DADDR_NULL for daddrs in getfsmap code xfs: Fix the owner setting issue for rmap query in xfs fsmap xfs: conditionally allow FS_XFLAG_REALTIME changes if S_DAX is set xfs: attr forks require attr, not attr2 xfs: remove unused parameter in macro XFS_DQUOT_LOGRES xfs: don't walk off the end of a directory data block xfs: Fix xfs_prepare_shift() range for RT xfs: Fix xfs_flush_unmap_range() range for RT xfs: create a new helper to return a file's allocation unit xfs: declare xfs_file.c symbols in xfs_file.h xfs: use consistent uid/gid when grabbing dquots for inodes xfs: verify buffer, inode, and dquot items every tx commit xfs: fix the contact address for the sysfs ABI documentation xfs: fix an agbno overflow in __xfs_getfsmap_datadev xfs: fix xfs_btree_query_range callers to initialize btree rec fully xfs: validate fsmap offsets specified in the query keys xfs: fix logdev fsmap query result filtering xfs: clean up the rtbitmap fsmap backend xfs: fix getfsmap reporting past the last rt extent xfs: fix integer overflows in the fsmap rtbitmap and logdev backends xfs: fix interval filtering in multi-step fsmap queries do_change_type(): refuse to operate on unmounted/not ours mounts fix propagation graph breakage by MOVE_MOUNT_SET_GROUP move_mount(2) ASoC: Intel: avs: Fix deadlock when the failing IPC is SET_D0IX ASoC: codecs: hda: Fix RPM usage count underflow seg6: Fix validation of nexthop addresses wireguard: device: enable threaded NAPI netfilter: nf_set_pipapo_avx2: fix initial map fill gve: add missing NULL check for gve_alloc_pending_packet() in TX DQO PM: sleep: Fix power.is_suspended cleanup for direct-complete devices vmxnet3: correctly report gso type for UDP tunnels net: fix udp gso skb_segment after pull from frag_list net: stmmac: make sure that ptp_rate is not 0 before configuring timestamping net: dsa: tag_brcm: legacy: fix pskb_may_pull length ice: fix rebuilding the Tx scheduler tree for large queue counts ice: create new Tx scheduler nodes for new queues only Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION spi: bcm63xx-hsspi: fix shared reset spi: bcm63xx-spi: fix shared reset net: lan966x: Make sure to insert the vlan tags also in host mode net/mlx4_en: Prevent potential integer overflow calculating Hz driver: net: ethernet: mtk_star_emac: fix suspend/resume issue net: tipc: fix refcount warning in tipc_aead_encrypt gve: Fix RX_BUFFERS_POSTED stat to report per-queue fill_cnt net: stmmac: platform: guarantee uniqueness of bus_id vt: remove VT_RESIZE and VT_RESIZEX from vt_compat_ioctl() coresight: prevent deactivate active config while enabling the config counter: interrupt-cnt: Protect enable/disable OPs with mutex MIPS: Loongson64: Add missing '#interrupt-cells' for loongson64c_ls7a iio: adc: ad7124: Fix 3dB filter frequency reading iio: filter: admv8818: Support frequencies >= 2^32 iio: filter: admv8818: fix range calculation iio: filter: admv8818: fix integer overflow iio: filter: admv8818: fix band 4, state 15 serial: Fix potential null-ptr-deref in mlb_usio_probe() usb: renesas_usbhs: Reorder clock handling and power management in probe PCI/DPC: Initialize aer_err_info before using it dmaengine: ti: Add NULL check in udma_probe() phy: qcom-qmp-usb: Fix an NULL vs IS_ERR() bug PCI: apple: Use gpiod_set_value_cansleep in probe flow PCI: cadence: Fix runtime atomic count underflow rtc: sh: assign correct interrupts with DT nfs: ignore SB_RDONLY when remounting nfs nfs: clear SB_RDONLY before getting superblock perf record: Fix incorrect --user-regs comments perf tests switch-tracking: Fix timestamp comparison mfd: stmpe-spi: Correct the name used in MODULE_DEVICE_TABLE mfd: exynos-lpass: Avoid calling exynos_lpass_disable() twice in exynos_lpass_remove() rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send() remoteproc: k3-r5: Drop check performed in k3_r5_rproc_{mbox_callback/kick} remoteproc: qcom_wcnss_iris: Add missing put_device() on error in probe perf scripts python: exported-sql-viewer.py: Fix pattern matching with Python 3 perf intel-pt: Fix PEBS-via-PT data_src hwmon: (asus-ec-sensors) check sensor index in read_string() mtd: nand: ecc-mxic: Fix use of uninitialized variable ret backlight: pm8941: Add NULL check in wled_configure() dm: free table mempools if not used in __bind dm: don't change md if dm_table_set_restrictions() fails perf ui browser hists: Set actions->thread before calling do_zoom_thread() perf build: Warn when libdebuginfod devel files are not available randstruct: gcc-plugin: Fix attribute addition randstruct: gcc-plugin: Remove bogus void member fbdev: core: fbcvt: avoid division by 0 in fb_cvt_hperiod() soc: aspeed: Add NULL check in aspeed_lpc_enable_snoop() soc: aspeed: lpc: Fix impossible judgment condition ARM: aspeed: Don't select SRAM arm64: dts: mt6359: Rename RTC node to match binding expectations arm64: dts: rockchip: disable unrouted USB controllers and PHY on RK3399 Puma with Haikou arm64: defconfig: mediatek: enable PHY drivers ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device dt-bindings: vendor-prefixes: Add Liontron name bus: fsl-mc: fix double-free on mc_dev nilfs2: do not propagate ENOENT error from nilfs_btree_propagate() nilfs2: add pointer check for nilfs_direct_propagate() ocfs2: fix possible memory leak in ocfs2_finish_quota_recovery Squashfs: check return result of sb_min_blocksize arm64: dts: qcom: sda660-ifc6560: Fix dt-validate warning arm64: dts: qcom: sdm660-lavender: Add missing USB phy supply arm64: dts: mt6359: Add missing 'compatible' property to regulators node arm64: dts: imx8mn-beacon: Fix RTC capacitive load arm64: dts: imx8mm-beacon: Fix RTC capacitive load arm64: dts: qcom: sdm660-xiaomi-lavender: Add missing SD card detect GPIO arm64: dts: mediatek: mt8195: Reparent vdec1/2 and venc1 power domains ARM: dts: at91: at91sam9263: fix NAND chip selects ARM: dts: at91: usb_a9263: fix GPIO for Dataflash chip select arm64: dts: qcom: sm8250: Fix CPU7 opp table f2fs: fix to correct check conditions in f2fs_cross_rename f2fs: use d_inode(dentry) cleanup dentry->d_inode net: phy: mscc: Stop clearing the the UDPv4 checksum for L2 frames net: openvswitch: Fix the dead loop of MPLS parse calipso: Don't call calipso functions for AF_INET sk. net: phy: mscc: Fix memory leak when using one step timestamping net: lan743x: rename lan743x_reset_phy to lan743x_hw_reset_phy bpf: Avoid __bpf_prog_ret0_warn when jit fails RDMA/cma: Fix hang when cma_netevent_callback fails to queue_work net: usb: aqc111: fix error handling of usbnet read calls netfilter: nft_tunnel: fix geneve_opt dump bpf, sockmap: Avoid using sk_socket after free when sending Bluetooth: MGMT: iterate over mesh commands in mgmt_mesh_foreach() vfio/type1: Fix error unwind in migration dirty bitmap allocation netfilter: nf_tables: nft_fib_ipv6: fix VRF ipv4/ipv6 result discrepancy kernfs: Relax constraint in draining guard wifi: ath9k_htc: Abort software beacon handling if disabled hisi_acc_vfio_pci: add eq and aeq interruption restore hisi_acc_vfio_pci: fix XQE dma address error iommu: remove duplicate selection of DMAR_TABLE wifi: rtw88: fix the 'para' buffer size to avoid reading out of bounds s390/bpf: Store backchain even for leaf progs clk: qcom: gcc-msm8939: Fix mclk0 & mclk1 for 24 MHz bpf: Fix WARN() in get_bpf_raw_tp_regs pinctrl: at91: Fix possible out-of-boundary access libbpf: Use proper errno value in nlattr ktls, sockmap: Fix missing uncharge operation tracing: Fix error handling in event_trigger_parse() tracing: Rename event_trigger_alloc() to trigger_data_alloc() efi/libstub: Describe missing 'out' parameter in efi_load_initrd clk: bcm: rpi: Add NULL check in raspberrypi_clk_register() clk: qcom: gpucc-sm6350: Add *_wait_val values for GDSCs clk: qcom: gcc-sm6350: Add *_wait_val values for GDSCs clk: qcom: dispcc-sm6350: Add *_wait_val values for GDSCs bpf: Fix uninitialized values in BPF_{CORE,PROBE}_READ RDMA/mlx5: Fix error flow upon firmware failure for RQ destruction netfilter: nft_quota: match correctly when the quota just depleted netfilter: bridge: Move specific fragmented packet to slow_path instead of dropping it libbpf: Use proper errno value in linker f2fs: fix to detect gcing page in f2fs_is_cp_guaranteed() f2fs: clean up w/ fscrypt_is_bounce_page() iommu: Protect against overflow in iommu_pgsize() scsi: hisi_sas: Call I_T_nexus after soft reset for SATA disk RDMA/hns: Include hnae3.h in hns_roce_hw_v2.h wifi: rtw88: do not ignore hardware read error during DPK libbpf: Fix buffer overflow in bpf_object__init_prog net: ncsi: Fix GCPS 64-bit member variables f2fs: fix to do sanity check on sbi->total_valid_block_count bpf, sockmap: Fix panic when calling skb_linearize bpf, sockmap: fix duplicated data transmission bpf: fix ktls panic with sockmap IB/cm: use rwlock for MAD agent lock wifi: ath11k: fix node corruption in ar->arvifs list scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops firmware: SDEI: Allow sdei initialization without ACPI_APEI_GHES drm/tegra: rgb: Fix the unbound reference count drm/vkms: Adjust vkms_state->active_planes allocation type drm: rcar-du: Fix memory leak in rcar_du_vsps_init() selftests/seccomp: fix syscall_restart test for arm compat arm64: Support ARM64_VA_BITS=52 when setting ARCH_MMAP_RND_BITS_MAX firmware: psci: Fix refcount leak in psci_dt_init m68k: mac: Fix macintosh_config for Mac II watchdog: exar: Shorten identity name to fit correctly fs/ntfs3: handle hdr_first_de() return value drm/bridge: lt9611uxc: Fix an error handling path in lt9611uxc_probe() arm64/fpsimd: Fix merging of FPSIMD state during signal return arm64/fpsimd: Discard stale CPU state when handling SME traps media: rkvdec: Fix frame size enumeration drm/amd/pp: Fix potential NULL pointer dereference in atomctrl_initialize_mc_reg_table drm/vmwgfx: Add seqno waiter for sync_files ASoC: apple: mca: Constrain channels according to TDM mask spi: sh-msiof: Fix maximum DMA transfer size ACPI: OSI: Stop advertising support for "3.0 _SCP Extensions" x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges() PM: wakeup: Delete space in the end of string shown by pm_show_wakelocks() power: reset: at91-reset: Optimize at91_reset() spi: tegra210-quad: modify chip select (CS) deactivation spi: tegra210-quad: remove redundant error handling code spi: tegra210-quad: Fix X1_X2_X4 encoding and support x4 transfers EDAC/skx_common: Fix general protection fault ASoC: tas2764: Enable main IRQs crypto: sun8i-ce - move fallback ahash_request to the end of the struct crypto: xts - Only add ecb if it is not already there crypto: lrw - Only add ecb if it is not already there crypto: marvell/cesa - Avoid empty transfer descriptor crypto: marvell/cesa - Handle zero-length skcipher requests x86/cpu: Sanitize CPUID(0x80000000) output powerpc/crash: Fix non-smp kexec preparation crypto: sun8i-ss - do not use sg_dma_len before calling DMA functions crypto: sun8i-ce-cipher - fix error handling in sun8i_ce_cipher_prepare() perf/core: Fix broken throttling when max_samples_per_tick=1 gfs2: gfs2_create_inode error handling fix thunderbolt: Do not double dequeue a configuration request usb: usbtmc: Fix timeout value in get_stb Bluetooth: hci_qca: move the SoC type check to the right place USB: serial: pl2303: add new chip PL2303GC-Q20 and PL2303GT-2AB usb: storage: Ignore UAS driver for SanDisk 3.2 Gen2 storage device usb: quirks: Add NO_LPM quirk for SanDisk Extreme 55AE rtc: Fix offset calculation for .start_secs < 0 rtc: Make rtc_time64_to_tm() support dates before 1970 acpi-cpufreq: Fix nominal_freq units to KHz in get_max_boost_ratio() pinctrl: armada-37xx: set GPIO output value before setting direction pinctrl: armada-37xx: use correct OUTPUT_VAL register for GPIOs > 31 tracing: Fix compilation warning on arm32 mm/uffd: fix vma operation where start addr cuts part of vma Signed-off-by: Khusika Dhamar Gusti <[email protected]> Conflicts: drivers/clk/rockchip/clk-rk3036.c drivers/media/i2c/ov8856.c drivers/pci/controller/dwc/pcie-dw-rockchip.c
2 parents ad3c429 + 7e69c33 commit 9d24229

File tree

496 files changed

+4435
-2085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+4435
-2085
lines changed

Documentation/ABI/testing/sysfs-fs-xfs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/fs/xfs/<disk>/log/log_head_lsn
22
Date: July 2014
33
KernelVersion: 3.17
4-
Contact: xfs@oss.sgi.com
4+
Contact: linux-xfs@vger.kernel.org
55
Description:
66
The log sequence number (LSN) of the current head of the
77
log. The LSN is exported in "cycle:basic block" format.
@@ -10,15 +10,15 @@ Users: xfstests
1010
What: /sys/fs/xfs/<disk>/log/log_tail_lsn
1111
Date: July 2014
1212
KernelVersion: 3.17
13-
Contact: xfs@oss.sgi.com
13+
Contact: linux-xfs@vger.kernel.org
1414
Description:
1515
The log sequence number (LSN) of the current tail of the
1616
log. The LSN is exported in "cycle:basic block" format.
1717

1818
What: /sys/fs/xfs/<disk>/log/reserve_grant_head
1919
Date: July 2014
2020
KernelVersion: 3.17
21-
Contact: xfs@oss.sgi.com
21+
Contact: linux-xfs@vger.kernel.org
2222
Description:
2323
The current state of the log reserve grant head. It
2424
represents the total log reservation of all currently
@@ -29,7 +29,7 @@ Users: xfstests
2929
What: /sys/fs/xfs/<disk>/log/write_grant_head
3030
Date: July 2014
3131
KernelVersion: 3.17
32-
Contact: xfs@oss.sgi.com
32+
Contact: linux-xfs@vger.kernel.org
3333
Description:
3434
The current state of the log write grant head. It
3535
represents the total log reservation of all currently

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5780,8 +5780,6 @@
57805780

57815781
Selecting 'on' will also enable the mitigation
57825782
against user space to user space task attacks.
5783-
Selecting specific mitigation does not force enable
5784-
user mitigations.
57855783

57865784
Selecting 'off' will disable both the kernel and
57875785
the user space protections.

Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ properties:
103103

104104
resets:
105105
items:
106-
- description: module reset
106+
- description:
107+
Module reset. This property is optional for controllers in Tegra194,
108+
Tegra234 etc where an internal software reset is available as an
109+
alternative.
107110

108111
reset-names:
109112
items:
@@ -119,6 +122,13 @@ properties:
119122
- const: rx
120123
- const: tx
121124

125+
required:
126+
- compatible
127+
- reg
128+
- interrupts
129+
- clocks
130+
- clock-names
131+
122132
allOf:
123133
- $ref: /schemas/i2c/i2c-controller.yaml
124134
- if:
@@ -172,6 +182,18 @@ allOf:
172182
items:
173183
- description: phandle to the VENC power domain
174184

185+
- if:
186+
not:
187+
properties:
188+
compatible:
189+
contains:
190+
enum:
191+
- nvidia,tegra194-i2c
192+
then:
193+
required:
194+
- resets
195+
- reset-names
196+
175197
unevaluatedProperties: false
176198

177199
examples:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,8 @@ patternProperties:
725725
description: Linux-specific binding
726726
"^linx,.*":
727727
description: Linx Technologies
728+
"^liontron,.*":
729+
description: Shenzhen Liontron Technology Co., Ltd
728730
"^liteon,.*":
729731
description: LITE-ON Technology Corp.
730732
"^litex,.*":

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 141
4+
SUBLEVEL = 142
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

@@ -1139,8 +1139,8 @@ LDFLAGS_vmlinux += --orphan-handling=warn
11391139
endif
11401140

11411141
# Align the bit size of userspace programs with the kernel
1142-
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1143-
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1142+
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1143+
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
11441144

11451145
# userspace programs are linked via the compiler, use the correct linker
11461146
ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy)

arch/arm/boot/dts/am335x-bone-common.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@
145145
/* MDIO */
146146
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
147147
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
148+
/* Added to support GPIO controlled PHY reset */
149+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE7)
148150
>;
149151
};
150152

@@ -153,6 +155,8 @@
153155
/* MDIO reset value */
154156
AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
155157
AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
158+
/* Added to support GPIO controlled PHY reset */
159+
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
156160
>;
157161
};
158162

@@ -377,6 +381,10 @@
377381

378382
ethphy0: ethernet-phy@0 {
379383
reg = <0>;
384+
/* Support GPIO reset on revision C3 boards */
385+
reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
386+
reset-assert-us = <300>;
387+
reset-deassert-us = <50000>;
380388
};
381389
};
382390

arch/arm/boot/dts/at91sam9263ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
nand@3 {
153153
reg = <0x3 0x0 0x800000>;
154154
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
155-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
155+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
156156
nand-bus-width = <8>;
157157
nand-ecc-mode = "soft";
158158
nand-on-flash-bbt;

arch/arm/boot/dts/qcom-apq8064.dtsi

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,6 @@
212212
};
213213
};
214214

215-
sfpb_mutex: hwmutex {
216-
compatible = "qcom,sfpb-mutex";
217-
syscon = <&sfpb_wrapper_mutex 0x604 0x4>;
218-
#hwlock-cells = <1>;
219-
};
220-
221215
smem {
222216
compatible = "qcom,smem";
223217
memory-region = <&smem_region>;
@@ -361,9 +355,10 @@
361355
pinctrl-0 = <&ps_hold>;
362356
};
363357

364-
sfpb_wrapper_mutex: syscon@1200000 {
365-
compatible = "syscon";
366-
reg = <0x01200000 0x8000>;
358+
sfpb_mutex: hwmutex@1200600 {
359+
compatible = "qcom,sfpb-mutex";
360+
reg = <0x01200600 0x100>;
361+
#hwlock-cells = <1>;
367362
};
368363

369364
intc: interrupt-controller@2000000 {

arch/arm/boot/dts/tny_a9263.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
nand@3 {
6565
reg = <0x3 0x0 0x800000>;
6666
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
67-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
67+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
6868
nand-bus-width = <8>;
6969
nand-ecc-mode = "soft";
7070
nand-on-flash-bbt;

arch/arm/boot/dts/usb_a9263.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
};
5959

6060
spi0: spi@fffa4000 {
61-
cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>;
61+
cs-gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
6262
status = "okay";
6363
flash@0 {
6464
compatible = "atmel,at45", "atmel,dataflash";
@@ -84,7 +84,7 @@
8484
nand@3 {
8585
reg = <0x3 0x0 0x800000>;
8686
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
87-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
87+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
8888
nand-bus-width = <8>;
8989
nand-ecc-mode = "soft";
9090
nand-on-flash-bbt;

0 commit comments

Comments
 (0)