8514 Commits

Author	SHA1	Message	Date
Deokgyu Yang	1a52871318	ODROID-M1: dts/dtbo: Introduce device tree overlay ... Comes with the first DTBO file, fanspeed-full.dts Signed-off-by: Steve Jeong <how2soft@gmail.com> Signed-off-by: Deokgyu Yang <secugyu@gmail.com> Change-Id: I1e3c18d026b1ebdd9d80a7b23b383b15d568fc42	2026-04-03 14:39:50 +09:00
Tao Huang	7921bd466a	Merge branch 'android14-6.1-2025-07' of https://android.googlesource.com/kernel/common ... * android14-6.1-2025-07: (3992 commits) ANDROID: virt: gunyah: Replace arm_smccc_1_1_smc with arm_smccc_1_1_invoke ANDROID: GKI: Add symbol list for Nothing UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del() ANDROID: 16K: Use vma_area slab cache for pad VMA ANDROID: 16K: Add VMA padding size to smaps output ANDROID: 16K: Don't copy data vma for maps/smaps output ANDROID: BACKPORT: KVM: arm64: Always unmap the pvmfw region at stage-2 ANDROID: GKI: add final newline to protected exports file ANDROID: abi_gki_aarch64_qcom: Add PCIe ECAM related symbols ANDROID: GKI: Export tracepoint tcp_retransmit_skb ANDROID: GKI: Update symbol list for vivo ANDROID: GKI: net: add vendor hooks net qos for gki purpose ANDROID: GKI: Update symbol list for vivo ANDROID: GKI: net: add vendor hooks net qos for gki purpose Revert "ANDROID: mm: Set PAGE_BLOCK_ORDER to 8 when ARM64_16K_PAGES" ANDROID: mm: Set PAGE_BLOCK_ORDER to 8 when ARM64_16K_PAGES ANDROID: GKI: Update symbol list for vivo ANDROID: vendor_hooks: add hook to retry mempool allocation without delay BACKPORT: FROMGIT: mm: Add CONFIG_PAGE_BLOCK_ORDER to select page block order BACKPORT: binder: Create safe versions of binder log files ... Change-Id: I0556b86c975710a929ab1c7cde9dfac0eaa4e07a	2025-07-07 19:58:59 +08:00
Greg Kroah-Hartman	45271a2c46	Merge tag 'android14-6.1.141_r00' into android14-6.1 ... This merges the android14-6.1.141_r00 tag into the android14-6.1 branch, catching it up with the latest LTS releases. It contains the following commits: * 18282059e0 Revert "espintcp: remove encap socket caching to avoid reference leak" * eb47017bf9 Revert "genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie" * 22d163151d Revert "perf: Avoid the read if the count is already updated" * f4b979262f Revert "coredump: hand a pidfd to the usermode coredump helper" * f23dc8c566 Revert "ipv6: save dontfrag in cork" * b572d7f4f2 Revert "serial: mctrl_gpio: split disable_ms into sync and no_sync APIs" * 7f0c46ade6 Revert "hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING" * ef60b4555d Merge 6.1.141 into android14-6.1-lts |\ | * 58485ff1a7 Linux 6.1.141 | * 0fadcc2043 net: ethernet: ti: am65-cpsw: Lower random mac address error print to info | * 12fd7e6a2c platform/x86: thinkpad_acpi: Ignore battery threshold change event notification | * 5d286f3cad platform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys | * dcabad63e0 NFS: Avoid flushing data while holding directory locks in nfs_rename() | * e1143267e9 nvme-pci: add NVME_QUIRK_NO_DEEPEST_PS quirk for SOLIDIGM P44 Pro | * d8f13a8aef spi: spi-sun4i: fix early activation | * 8f55d71b57 um: let 'make clean' properly clean underlying SUBARCH as well | * fe4fb4134f platform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS | * 38e8c73f02 nfs: don't share pNFS DS connections between net namespaces | * 84b06a4293 HID: quirks: Add ADATA XPG alpha wireless mouse support | * ac19091288 coredump: hand a pidfd to the usermode coredump helper | * b2a5bf1cf4 fork: use pidfd_prepare() | * 1ced79b25f pid: add pidfd_prepare() | * fc7846a7d5 coredump: fix error handling for replace_fd() | * 3939280be9 perf/arm-cmn: Initialise cmn->cpu earlier | * 05b21a536a perf/arm-cmn: Fix REQ2/SNP2 mixup | * a0ec22fa20 net_sched: hfsc: Address reentrant enqueue adding class to eltree twice | * a5a9c42cd7 arm64: dts: qcom: sm8350: Fix typo in pil_camera_mem node | * 0297e7ddf5 af_unix: Fix uninit-value in __unix_walk_scc() | * c7edc6e616 af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS | * 28201f38dc af_unix: Add dead flag to struct scm_fp_list. | * f9977b176f af_unix: Don't access successor in unix_del_edges() during GC. | * 951e454715 af_unix: Try not to hold unix_gc_lock during accept(). | * 61a75360dc af_unix: Remove lock dance in unix_peek_fds(). | * 5dfd283f46 af_unix: Replace garbage collection algorithm. | * 9734d332ef af_unix: Detect dead SCC. | * 61f3d2706c af_unix: Assign a unique index to SCC. | * adfb68b39b af_unix: Avoid Tarjan's algorithm if unnecessary. | * b5b54a3875 af_unix: Skip GC if no cycle exists. | * ccbe3d2aca af_unix: Save O(n) setup of Tarjan's algo. | * edfa4872d0 af_unix: Fix up unix_edge.successor for embryo socket. | * 12365b707c af_unix: Save listener for embryo socket. | * a6c7ce40ea af_unix: Detect Strongly Connected Components. | * 878df6a069 af_unix: Iterate all vertices by DFS. | * 5593cb9b1c af_unix: Bulk update unix_tot_inflight/unix_inflight when queuing skb. | * f8194e511c af_unix: Link struct unix_edge when queuing skb. | * 6b7a036eaa af_unix: Allocate struct unix_edge for each inflight AF_UNIX fd. | * 1002e86c46 af_unix: Allocate struct unix_vertex for each inflight AF_UNIX fd. | * 44aebf50fa af_unix: Remove CONFIG_UNIX_SCM. | * 6afc128665 af_unix: Remove io_uring code for GC. | * a1ee63f7a0 af_unix: Replace BUG_ON() with WARN_ON_ONCE(). | * e9bd632f98 af_unix: Try to run GC async. | * ceb8bd6c69 af_unix: Run GC on only one CPU. | * 7637a75aed af_unix: Return struct unix_sock from unix_get_socket(). | * 63d00b25e0 af_unix: Kconfig: make CONFIG_UNIX bool | * 36679fab54 btrfs: check folio mapping after unlock in relocate_one_folio() | * 82ac6adbbb hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING | * 22e3ccf1d5 octeontx2-pf: Fix page pool frag allocation warning | * 173d9d060c octeontx2-pf: Fix page pool cache index corruption. | * a84f95fecb octeontx2-pf: fix page_pool creation fail for rings > 32k | * bc952bf4e0 dmaengine: idxd: Fix passing freed memory in idxd_cdev_open() | * 50026aa530 x86/mm/init: Handle the special case of device private pages in add_pages(), to not increase max_pfn and trigger dma_addressing_limited() bounce buffers bounce buffers | * bb6e80472e i3c: master: svc: Fix implicit fallthrough in svc_i3c_master_ibi_work() | * 79c9df2d7a pinctrl: tegra: Fix off by one in tegra_pinctrl_get_group() | * c0c0b03ea1 serial: sh-sci: Save and restore more registers | * 9502ebf2d2 kbuild: Disable -Wdefault-const-init-unsafe | * 2c29113154 spi: spi-fsl-dspi: Reset SR flags before sending a new message | * 8bdaffcdd7 spi: spi-fsl-dspi: Halt the module after a new message transfer | * f48dc6849c spi: spi-fsl-dspi: restrict register range for regmap access | * 795cea4731 ksmbd: fix stream write failure | * 4c8d922337 Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection" | * b9f7969173 mm/page_alloc.c: avoid infinite retries caused by cpuset race | * 460664bf8b memcg: always call cond_resched() after fn() | * 9c40d1f7b7 Revert "drm/amd: Keep display off while going into S4" | * 080da7b2fc smb: client: Reset all search buffer pointers when releasing buffer | * c8623231e0 smb: client: Fix use-after-free in cifs_fill_dirent | * 34e2f19e0e drm/edid: fixed the bug that hdr metadata was not reset | * 60bd13f8c4 platform/x86: dell-wmi-sysman: Avoid buffer overflow in current_password_store() | * 836024a6c8 llc: fix data loss when reading from a socket in llc_ui_recvmsg() | * eefcc081ac ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10 | * f3e14d706e ALSA: pcm: Fix race of buffer access at PCM OSS layer | * 6d7d458c41 can: bcm: add missing rcu read protection for procfs content | * 2a437b86ac can: bcm: add locking for bcm_op runtime updates | * 24ee050bb9 can: slcan: allow reception of short error messages | * cceb15864e padata: do not leak refcount in reorder_work | * f0f3d09f53 crypto: algif_hash - fix double free in hash_accept | * 3cb003b959 octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG | * 7b1357a108 octeontx2-af: Set LMT_ENA bit for APR table entries | * b8fcae6d2e net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done | * a005991013 octeontx2-pf: Add AF_XDP non-zero copy support | * 2a2d7bf86d octeontx2-pf: Add support for page pool | * f1dde3eb17 sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() | * f2138e462c io_uring: fix overflow resched cqe reordering | * 8620be38cf net: lan743x: Restore SGMII CTRL register on resume | * e8138b81d3 net: dwmac-sun8i: Use parsed internal PHY address instead of 1 | * b6556470bb ice: fix vf->num_mac count with port representors | * 2cee71a1a2 bridge: netfilter: Fix forwarding of fragmented packets | * 15efa7d00f Bluetooth: L2CAP: Fix not checking l2cap_chan security level | * 7549955105 dmaengine: idxd: Fix ->poll() return value | * 35e6a84883 xfrm: Sanitize marks before insert | * c4bfea4b61 clk: sunxi-ng: d1: Add missing divider for MMC mod clocks | * 8509fb9dec remoteproc: qcom_wcnss: Fix on platforms without fallback regulators | * d19d0157ed dmaengine: idxd: Fix allowing write() from different address spaces | * 206d8a7b8c dmaengine: idxd: add idxd_copy_cr() to copy user completion record during page fault handling | * 22d907d735 dmaengine: idxd: add per DSA wq workqueue for processing cr faults | * e4cde54b46 espintcp: remove encap socket caching to avoid reference leak | * 9b0915e72b __legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock | * a58442f75b xenbus: Allow PVH dom0 a non-local xenstore | * 390940c7f3 wifi: iwlwifi: add support for Killer on MTL | * 0528bba48d btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref | * 7c0394dbbd io_uring/fdinfo: annotate racy sq/cq head/tail reads | * c240375587 nvmet-tcp: don't restore null sk_state_change | * e104460e8a ALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx | * 9fce40ac35 ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013 | * 181438633a pinctrl: meson: define the pull up/down resistor value as 60 kOhm | * f4ae54bffb ASoC: imx-card: Adjust over allocation of memory in imx_card_parse_of() | * ffb55ddf26 drm: Add valid clones check | * d822a8e3fb drm/panel-edp: Add Starry 116KHD024006 | * 6a93438018 drm/atomic: clarify the rules around drm_atomic_state->allow_modeset | * a78b779206 wifi: ath9k: return by of_get_mac_address | * f60d34d4a4 regulator: ad5398: Add device tree support | * d97d423ad1 spi: zynqmp-gqspi: Always acknowledge interrupts | * 8d0c67acdf wifi: rtw89: add wiphy_lock() to work that isn't held wiphy_lock() yet | * f4c4d18f72 wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate | * 60f09a491f wifi: rtl8xxxu: retry firmware download on error | * e7e61e09ce perf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt | * 77a7df4b23 bpftool: Fix readlink usage in get_fd_type | * 658a933038 drm/ast: Find VBIOS mode from regular display size | * 762535bc37 ASoC: codecs: pcm3168a: Allow for 24-bit in provider mode | * 08aec29a16 HID: usbkbd: Fix the bit shift number for LED_KANA | * 3b72b12487 scsi: st: Restore some drive settings after reset | * 9f9a65de83 scsi: lpfc: Free phba irq in lpfc_sli4_enable_msi() when pci_irq_vector() fails | * 14f8b37e1c scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine | * 31fbeed785 net/mana: fix warning in the writer of client oob | * e0d0424a8a ice: count combined queues using Rx/Tx count | * e1c3bfe365 perf: Avoid the read if the count is already updated | * 84916c757c rcu: fix header guard for rcu_all_qs() | * e2df1936c1 rcu: handle unstable rdp in rcu_read_unlock_strict() | * 6090e60428 rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y | * 77835a04b1 r8169: don't scan PHY addresses > 0 | * 784b78295a vxlan: Annotate FDB data races | * 73b9240149 media: qcom: camss: csid: Only add TPG v4l2 ctrl if TPG hardware is available | * 50b7e3276b hwmon: (xgene-hwmon) use appropriate type for the latency value | * e35875dd2b clk: qcom: camcc-sm8250: Use clk_rcg2_shared_ops for some RCGs | * 5338343080 wifi: rtw88: Fix download_firmware_validate() for RTL8814AU | * 83b5df3df8 r8152: add vendor/device ID pair for Dell Alienware AW1022z | * ce534438a8 ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure(). | * 81d2a85c65 arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src | * 6dc0a704f5 wifi: mac80211: remove misplaced drv_mgd_complete_tx() call | * 9fc9237ffa wifi: mac80211: don't unconditionally call drv_mgd_complete_tx() | * 5d2af99518 net/mlx5e: reduce rep rxq depth to 256 for ECPF | * 468255c8ed net/mlx5e: set the tx_queue_len for pfifo_fast | * d525e62f18 net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB | * e4f6a56f45 drm/amd/display/dm: drop hw_support check in amdgpu_dm_i2c_xfer() | * 9131a4be79 drm/amdgpu: enlarge the VBIOS binary size limit | * bc40b6248a drm/amd/display: Initial psr_version with correct setting | * 81f4b82cf3 drm/amdgpu: reset psp->cmd to NULL after releasing the buffer | * cfdf164ef5 phy: core: don't require set_mode() callback for phy_get_mode() to work | * b6e568caaf serial: sh-sci: Update the suspend/resume support | * 5e3ee618d6 clk: qcom: clk-alpha-pll: Do not use random stack value for recalc rate | * a6e871c912 net/mlx4_core: Avoid impossible mlx4_db_alloc() order value | * 0d52c6168d kunit: tool: Use qboot on QEMU x86_64 | * 5d08c89c2a smack: recognize ipv4 CIPSO w/o categories | * b23976c6f9 pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map | * 709b1fb223 ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() | * 4ffaac5e21 ASoC: tas2764: Power up/down amp on mute ops | * ec3a91e22b ASoC: tas2764: Mark SW_RESET as volatile | * 051f0ee928 ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG | * d9f7ac25ff ASoC: ops: Enforce platform maximum on initial value | * 963bac7f04 net/mlx5: Apply rate-limiting to high temperature warning | * 89acf46b9e net/mlx5: Modify LSB bitmask in temperature event to include only the first bit | * 4d142115a9 media: test-drivers: vivid: don't call schedule in loop | * 79dbd04fcc vxlan: Join / leave MC group after remote changes | * 23ecfd5383 ACPI: HED: Always initialize before evged | * 58fe8fead9 PCI: Fix old_size lower bound in calculate_iosize() too | * 5f1ecc9aa5 eth: mlx4: don't try to complete XDP frames in netpoll | * 0d9d54113f can: c_can: Use of_property_present() to test existence of DT property | * e3c93c7917 pmdomain: imx: gpcv2: use proper helper for property detection | * 24eb0979ff RDMA/core: Fix best page size finding when it can cross SG entries | * 68435c1fa3 serial: mctrl_gpio: split disable_ms into sync and no_sync APIs | * 74db6edb69 i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA) | * 07bf524a78 EDAC/ie31200: work around false positive build warning | * ef1158a6a6 net: pktgen: fix access outside of user given buffer in pktgen_thread_write() | * 70a9888018 wifi: rtw89: fw: propagate error code from rtw89_h2c_tx() | * 3635589fa5 wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 | * 1c17d07fc4 wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU | * 100c6e2d0c wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU | * 526ec91398 scsi: mpt3sas: Send a diag reset if target reset fails | * 790f74d684 clocksource: mips-gic-timer: Enable counter when CPUs start | * 3972bd4ca5 MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core | * e4d3763223 genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie | * 3394aafdc8 MIPS: Use arch specific syscall name match function | * ea4497337f x86/kaslr: Reduce KASLR entropy on most x86 systems | * 95d0892433 dm: fix unconditional IO throttle caused by REQ_PREFLUSH | * 75b01247b4 libbpf: Fix out-of-bound read | * 01b4545bbc media: adv7180: Disable test-pattern control on adv7180 | * a9edb70084 cpuidle: menu: Avoid discarding useful information | * 60750801ca x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus() | * 42733703c4 drm/amd/display: handle max_downscale_src_width fail check | * a66f46751c x86/build: Fix broken copy command in genimage.sh when making isoimage | * 5f496a9f1c soc: ti: k3-socinfo: Do not use syscon helper to build regmap | * 3572663c55 bonding: report duplicate MAC address in all situations | * 365e617487 net: xgene-v2: remove incorrect ACPI_PTR annotation | * 62e7868f06 net: ethernet: mtk_ppe_offload: Allow QinQ, double ETH_P_8021Q only | * 2272c9d14c leds: pwm-multicolor: Add check for fwnode_property_read_u32 | * c8cc14eeb2 drm/amdkfd: KFD release_work possible circular locking | * 1964a698cb selftests/net: have `gro.sh -t` return a correct exit code | * 866ae3322f net/mlx5: Avoid report two health errors on same syndrome | * c6aa1d6bd6 firmware: arm_ffa: Set dma_mask for ffa devices | * de963561ef PCI: brcmstb: Add a softdep to MIP MSI-X driver | * 9fe2a6513a PCI: brcmstb: Expand inbound window size up to 64GB | * 2d533b62db soc: apple: rtkit: Implement OSLog buffers properly | * 8d64b2aa3e soc: apple: rtkit: Use high prio work queue | * 0c14267f4d fpga: altera-cvp: Increase credit timeout | * 31b96c1543 drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence | * eeb808ce1e ARM: at91: pm: fix at91_suspend_finish for ZQ calibration | * 05315e1507 hwmon: (gpio-fan) Add missing mutex locks | * 594dbf0a19 x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2 | * a5df17f35b clk: imx8mp: inform CCF of maximum frequency of clocks | * 6782a62c32 media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map | * 7d49558be0 drm/rockchip: vop2: Add uv swap for cluster window | * 79f3edb937 ipv4: fib: Move fib_valid_key_len() to rtm_to_fib_config(). | * f29dd5afa1 ALSA: hda/realtek: Enable PC beep passthrough for HP EliteBook 855 G7 | * 628ff556e4 perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type | * 48bd9b9d66 net: pktgen: fix mpls maximum labels list parsing | * d1f95fbdf6 net: ethernet: ti: cpsw_new: populate netdev of_node | * 4473bd0993 pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned" | * 9d1a5be86d media: cx231xx: set device_caps for 417 | * 41f654291b drm/amdgpu: Do not program AGP BAR regs under SRIOV in gfxhub_v1_0.c | * 8d0d4c11ca remoteproc: qcom_wcnss: Handle platforms with only single power domain | * fdf85aa795 net: phylink: use pl->link_interface in phylink_expects_phy() | * 15602508ad orangefs: Do not truncate file size | * 00586b78ee dm cache: prevent BUG_ON by blocking retries on failed device resumes | * 2996d38f2d media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe() | * b649481a1c ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114 | * fd10aa99ef ieee802154: ca8210: Use proper setters and getters for bitwise types | * 9569e35890 rtc: ds1307: stop disabling alarms on probe | * 2c86fafda7 tcp: bring back NUMA dispersion in inet_ehash_locks_alloc() | * e6ca4d234b ALSA: seq: Improve data consistency at polling | * aba0c50463 powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 | * 806d3ee930 arm64: tegra: p2597: Fix gpio for vdd-1v8-dis regulator | * a98bd864e1 crypto: lzo - Fix compression buffer overrun | * 8917266622 cpufreq: tegra186: Share policy per cluster | * 239afef07e iommu/amd/pgtbl_v2: Improve error handling | * 64e88f718e ASoC: qcom: sm8250: explicitly set format in sm8250_be_hw_params_fixup() | * f306821a7b auxdisplay: charlcd: Partially revert "Move hwidth and bwidth to struct hd44780_common" | * 9e5228610f gfs2: Check for empty queue in run_queue | * 0b60d03644 drm/amd/display: calculate the remain segments for all pipes | * 4f809be95d ipv6: save dontfrag in cork | * 4a8fcd77ce hwmon: (dell-smm) Increment the number of fans | * d0306f88b4 mmc: sdhci: Disable SD card clock before changing parameters | * 03c9ac48ae mmc: dw_mmc: add exynos7870 DW MMC support | * 5cdb89f76e arm64/mm: Check PUD_TYPE_TABLE in pud_bad() | * 3bb62cc313 netfilter: conntrack: Bound nf_conntrack sysctl writes | * e563401934 timer_list: Don't use %pK through printk() | * 209f290b4f posix-timers: Add cond_resched() to posix_timer_add() search loop | * 8d67953978 RDMA/uverbs: Propagate errors from rdma_lookup_get_uobject() | * 6944537397 ext4: reject the 'data_err=abort' option in nojournal mode | * e472c3d8ad ASoC: sun4i-codec: support hp-det-gpios property | * 7fcfed72a5 pinctrl-tegra: Restore SFSEL bit when freeing pins | * 02d850de94 xen: Add support for XenServer 6.1 platform device | * 9af7628ee6 net/smc: use the correct ndev to find pnetid by pnetid table | * 6d974bd692 dm: restrict dm device size to 2^63-512 bytes | * 3b5cc6e49c crypto: octeontx2 - suppress auth failure screaming due to negative tests | * df5a4416c0 kbuild: fix argument parsing in scripts/config | * e78a34da61 ASoC: mediatek: mt6359: Add stub for mt6359_accdet_enable_jack_detect | * 669a53eecc thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer | * 7d9682b015 rtc: rv3032: fix EERD location | * 9ff6d39f17 tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() | * a73f1ba994 bpf: Return prog btf_id without capable check | * 6cd9c9167c vfio/pci: Handle INTx IRQ_NOTCONNECTED | * 4c92971bed scsi: st: ERASE does not change tape location | * 1f20b8eccf scsi: st: Tighten the page format heuristics with MODE SELECT | * 7f778cbffe ext4: reorder capability check last | * ea4d9e1a6c um: Update min_low_pfn to match changes in uml_reserved | * f8ddfaab46 um: Store full CSGSFS and SS register from mcontext | * 75f74c89a8 dlm: make tcp still work in multi-link env | * f2985a1de6 i3c: master: svc: Fix missing STOP for master request | * 227c253c9e drm/amd/display: Guard against setting dispclk low for dcn31x | * 822c0e09f4 btrfs: send: return -ENAMETOOLONG when attempting a path that is too long | * 22bb11b3d5 btrfs: get zone unusable bytes while holding lock at btrfs_reclaim_bgs_work() | * e2965d9d21 btrfs: fix non-empty delayed iputs list on unmount due to async workers | * 013614c23e btrfs: run btrfs_error_commit_super() early | * 2abb4bb795 btrfs: avoid linker error in btrfs_find_create_tree_block() | * df4af023f6 btrfs: make btrfs_discard_workfn() block_group ref explicit | * e212c8e9f2 i2c: pxa: fix call balance of i2c->clk handling routines | * fb6a04c3b7 i2c: qup: Vote for interconnect bandwidth to DRAM | * 8c18c904d3 x86/mm: Check return value from memblock_phys_alloc_range() | * fa73abd359 mmc: host: Wait for Vdd to settle on card power off | * db1aef51b8 libnvdimm/labels: Fix divide error in nd_label_data_init() | * 1671494b71 PCI: vmd: Disable MSI remapping bypass under Xen | * 5ad8142667 pNFS/flexfiles: Report ENETDOWN as a connection error | * 1d5786b3ba tools/build: Don't pass test log files to linker | * 1325473aba PCI: dwc: ep: Ensure proper iteration over outbound map windows | * 1fdd7255d5 objtool: Properly disable uaccess validation | * 2896063907 lockdep: Fix wait context check on softirq for PREEMPT_RT | * 2d905fdb7f dql: Fix dql->limit value when reset. | * 33aaf2e4d3 thermal/drivers/qoriq: Power down TMU on system suspend | * 61ce7181fb SUNRPC: rpcbind should never reset the port to the value '0' | * 18dd5c41f6 SUNRPC: rpc_clnt_set_transport() must not change the autobind setting | * b11ffd1dc3 NFSv4: Treat ENETUNREACH errors as fatal for state recovery | * 8e93857d8d cifs: Fix establishing NetBIOS session for SMB2+ connection | * 96106d4f3f fbdev: core: tileblit: Implement missing margin clearing for tileblit | * 57aa1e8197 fbcon: Use correct erase colour for clearing in fbcon | * af6e4ccb08 fbdev: fsl-diu-fb: add missing device_remove_file() | * d8aea4921f mailbox: use error ret code of of_parse_phandle_with_args() | * 6707f9749d tracing: Mark binary printing functions with __printf() attribute | * cdfe09355c arm64: Add support for HIP09 Spectre-BHB mitigation | * 0b99bcbd62 SUNRPC: Don't allow waiting for exiting tasks | * 2bd25a7916 NFS: Don't allow waiting for exiting tasks | * 429d487d94 NFSv4: Check for delegation validity in nfs_start_delegation_return_locked() | * f706cb4e37 fuse: Return EPERM rather than ENOSYS from link() | * b413cf7ff5 cifs: Fix negotiate retry functionality | * 5d736eee3c cifs: Fix querying and creating MF symlinks over SMB1 | * 17e53a15e6 cifs: Add fallback for SMB2 CREATE without FILE_READ_ATTRIBUTES | * 8696f0e4f6 s390/vfio-ap: Fix no AP queue sharing allowed message written to kernel log | * 53dd81d7ba kconfig: merge_config: use an empty file as initfile | * aa8687470a samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora | * 0953353269 bpf: fix possible endless loop in BPF map iteration | * 5f3d693861 selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure | * f238c9c15d drm/amdgpu: Allow P2P access through XGMI | * 4964646234 net: enetc: refactor bulk flipping of RX buffers to separate function | * 1d44f1511b scsi: mpi3mr: Add level check to control event logging | * 91fe35809e cgroup: Fix compilation issue due to cgroup_mutex not being exported | * 04aa1f6d16 dma-mapping: avoid potential unused data compilation warning | * b6d6419548 virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN | * 6815846e0c scsi: target: iscsi: Fix timeout on deleted connection | * ee963a9847 phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off | * a640e906d9 phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data | * 6dbb6f00dc phy: renesas: rcar-gen3-usb2: Move IRQ request in probe | * ba7694f61c phy: renesas: rcar-gen3-usb2: Add support to initialize the bus | * 262e32568a gpio: pca953x: fix IRQ storm on system wake up | * aa34c055d3 gpio: pca953x: Simplify code with cleanup helpers | * af7488d114 gpio: pca953x: Split pca953x_restore_context() and pca953x_save_context() | * 59047be46c gpio: pca953x: Add missing header(s) * | deadfd1486 Merge android14-6.1 into android14-6.1-lts * | f4843e14bf Merge 6.1.140 into android14-6.1-lts |\| | * da3c5173c5 Linux 6.1.140 | * 05e85d3767 x86/modules: Set VM_FLUSH_RESET_PERMS in module_alloc() | * 4e6310e8d4 drm/amdgpu: fix pm notifier handling | * 2c914aac95 spi: cadence-qspi: fix pointer reference in runtime PM hooks | * 55bf541e01 ipv4: Fix uninit-value access in __ip_make_skb() | * a05c1ede50 ipv6: Fix potential uninit-value access in __ip6_make_skb() | * b7fd784d7c bnxt_en: Fix receive ring space parameters when XDP is active | * ab47d72b73 platform/x86/amd/pmc: Only disable IRQ1 wakeup where i8042 actually enabled it | * f6421555db arm64/sme: Always exit sme_alloc() early with existing storage | * b0f013bebf netfilter: nf_tables: do not defer rule destruction via call_rcu | * e6c32a64d6 netfilter: nf_tables: wait for rcu grace period on net_device removal | * bbd68196ac netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx | * 18eb53a273 btrfs: don't BUG_ON() when 0 reference count at btrfs_lookup_extent_info() | * 386507cb6f sctp: add mutual exclusion in proc_sctp_do_udp_port() | * 3926b572fd hwpoison, memory_hotplug: lock folio before unmap hwpoisoned folio | * 091a7f20d5 LoongArch: Explicitly specify code model in Makefile | * 9e80f366eb bpf, arm64: Fix address emission with tag-based KASAN enabled | * 0771494784 bpf, arm64: Fix trampoline for BPF_TRAMP_F_CALL_ORIG | * 92f08673d3 riscv: mm: Fix the out of bound issue of vmemmap address | * e5ec1c24e7 mm/vmscan: fix a bug calling wakeup_kswapd() with a wrong zone index | * 09b18c2435 selftests/mm: compaction_test: support platform with huge mount of memory | * 0529646acd usb: typec: fix pm usage counter imbalance in ucsi_ccg_sync_control() | * e44189455c usb: typec: fix potential array underflow in ucsi_ccg_sync_control() | * f1c5ddaef5 usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group | * f32451ca4c usb: typec: ucsi: displayport: Fix deadlock | * d8ef6140fe dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe | * 64afd9a1f6 dmaengine: idxd: fix memory leak in error handling path of idxd_alloc | * 68ac5a01f6 dmaengine: idxd: Add missing idxd cleanup to fix memory leak in remove call | * 24d9c14fdc dmaengine: idxd: Add missing cleanups in cleanup internals | * 9b4947544b dmaengine: idxd: Add missing cleanup for early error out in idxd_setup_internals | * 50f2300178 dmaengine: idxd: fix memory leak in error handling path of idxd_setup_groups | * 11fd63ea08 dmaengine: idxd: fix memory leak in error handling path of idxd_setup_engines | * d584acdf54 dmaengine: idxd: fix memory leak in error handling path of idxd_setup_wqs | * c70ec7dc88 dmaengine: ti: k3-udma: Use cap_mask directly from dma_device structure instead of a local copy | * df5987e76a dmaengine: ti: k3-udma: Add missing locking | * 8e460b77b7 net: qede: Initialize qede_ll_ops with designated initializer | * b892e830d1 wifi: mt76: disable napi on driver removal | * e424894340 smb: client: fix memory leak during error handling for POSIX mkdir | * d5b4310993 scsi: sd_zbc: block: Respect bio vector limits for REPORT ZONES buffer | * 4861b3d2a4 phy: renesas: rcar-gen3-usb2: Set timing registers only once | * 9b85a453ea phy: renesas: rcar-gen3-usb2: Fix role detection on unbind/bind | * f774628bc1 phy: Fix error handling in tegra_xusb_port_init | * 12ba469abe tracing: samples: Initialize trace_array_printk() with the correct function | * cbe20c2c83 ftrace: Fix preemption accounting for stacktrace filter command | * c4edc834d2 ftrace: Fix preemption accounting for stacktrace trigger command | * 763db1b8b0 Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer() | * 6ef4c72213 Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges | * b47a984faf hv_netvsc: Remove rmsg_pgcnt | * 86b05e14c4 hv_netvsc: Preserve contiguous PFN grouping in the page buffer array | * 3e5210def3 hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages | * 3becc659f9 dma-buf: insert memory barrier before updating num_fences | * 01dfc57326 ALSA: usb-audio: Add sample rate quirk for Microdia JP001 USB Camera | * 7ba07e109f ALSA: usb-audio: Add sample rate quirk for Audioengine D1 | * f5abc1344f ALSA: es1968: Add error handling for snd_pcm_hw_constraint_pow2() | * b71a04bae2 ACPI: PPTT: Fix processor subtable walk | * 0638bad18d drm/amd/display: Avoid flooding unnecessary info messages | * d9632f4aae drm/amd/display: Correct the reply value when AUX write incomplete | * 0f035835b4 btrfs: fix discard worker infinite loop after disabling discard | * 0567e7951f LoongArch: Fix MAX_REG_OFFSET calculation | * 02a11d8638 dmaengine: Revert "dmaengine: dmatest: Fix dmatest waiting less when interrupted" | * 8f2eb3adb3 NFSv4/pnfs: Reset the layout state after a layoutreturn | * 8f7f96549b net/tls: fix kernel panic when alloc_page failed | * 2c09d6460f octeontx2-pf: macsec: Fix incorrect max transmit size in TX secy | * 6ba30f7aa2 regulator: max20086: fix invalid memory access | * 10ea81e478 qlcnic: fix memory leak in qlcnic_sriov_channel_cfg_cmd() | * 1e577aeb51 net/mlx5e: Disable MACsec offload for uplink representor profile | * 6fbcfa3691 ALSA: sh: SND_AICA should depend on SH_DMA_API | * 9609469159 nvme-pci: acquire cq_poll_lock in nvme_poll_irqdisable | * 6fc167d45f nvme-pci: make nvme_pci_npages_prp() __always_inline | * 4626234ca3 net: dsa: sja1105: discard incoming frames in BR_STATE_LISTENING | * aace6b6389 net: cadence: macb: Fix a possible deadlock in macb_halt_tx. | * 1cb9a891cf net: mctp: Ensure keys maintain only one ref to corresponding dev | * d38939ebe0 net_sched: Flush gso_skb list too during ->change() | * 915c3de392 spi: loopback-test: Do not split 1024-byte hexdumps | * 85fb7f8ca5 nfs: handle failure of nfs_get_lock_context in unlock path | * 01b76cc8ca HID: uclogic: Add NULL check in uclogic_input_configured() | * de9b6d0635 HID: thrustmaster: fix memory leak in thrustmaster_interrupts() | * 52daccfc3f RDMA/rxe: Fix slab-use-after-free Read in rxe_queue_cleanup bug | * 718df14948 clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable() | * c4a550e0ba iio: chemical: sps30: use aligned_s64 for timestamp | * 39d30f8ecc iio: adc: ad7768-1: Fix insufficient alignment of timestamp. | * ced7c789e3 Revert "drm/amd: Stop evicting resources on APUs in suspend" | * a2419fa7fe drm/amd: Add Suspend/Hibernate notification callback support | * 43b8b33b81 drm/amdgpu: trigger flr_work if reading pf2vf data failed | * c3408b49e3 drm/amdgpu: Fix the runtime resume failure issue | * 6b9418c825 drm/amd: Stop evicting resources on APUs in suspend | * d7b0db1246 iio: adc: ad7266: Fix potential timestamp alignment issue. | * 22bed5bd0d tpm: tis: Double the timeout B to 4s | * 2f81039276 tracing: probes: Fix a possible race in trace_probe_log APIs | * 5eadacf806 platform/x86: asus-wmi: Fix wlan_ctrl_by_user detection | * 44f3f92053 binfmt_elf: Move brk for static PIE even if ASLR disabled | * af66f1d950 binfmt_elf: Honor PT_LOAD alignment for static PIE | * 2fb38e1a01 binfmt_elf: Calculate total_size earlier | * add3a49ae9 selftests/exec: Build both static and non-static load_address tests | * 7a60eba05a binfmt_elf: Leave a gap between .bss and brk | * fea22a3e06 selftests/exec: load_address: conform test to TAP format output | * 1707053766 binfmt_elf: elf_bss no longer used by load_elf_binary() | * 86811e8778 binfmt_elf: Support segments with 0 filesz and misaligned starts | * e20878d4eb binfmt: Fix whitespace issues * | d2136f8626 Merge 6.1.139 into android14-6.1-lts |/ * 325285d9fc Linux 6.1.139 * 69afd82670 x86/its: FineIBT-paranoid vs ITS * 73c71762fe x86/alternatives: Remove faulty optimization * 7e00c01ff8 x86/alternative: Optimize returns patching * c2bece04ba x86/its: Fix build errors when CONFIG_MODULES=n * 959cadf09d x86/its: Use dynamic thunks for indirect branches * 9502e83c22 x86/ibt: Keep IBT disabled during alternative patching * e6da4a83e3 x86/its: Align RETs in BHB clear sequence to avoid thunking * 139c0b8318 x86/its: Add "vmexit" option to skip mitigation on some CPUs * b1701fee52 x86/its: Enable Indirect Target Selection mitigation * dbd8f170af x86/its: Add support for ITS-safe return thunk * 5e7d4f2ace x86/its: Add support for ITS-safe indirect thunk * 0eda20c29e x86/its: Enumerate Indirect Target Selection (ITS) bug * ed2e894a76 Documentation: x86/bugs/its: Add ITS documentation * b1ef84b0ff x86/speculation: Remove the extra #ifdef around CALL_NOSPEC * fb3768004e x86/speculation: Add a conditional CS prefix to CALL_NOSPEC * 4bc1033dff x86/speculation: Simplify and make CALL_NOSPEC consistent * db734ba733 x86/bhi: Do not set BHI_DIS_S in 32-bit mode * cebc238b02 x86/bpf: Add IBHF call at end of classic BPF * 845c707b80 x86/bpf: Call branch history clearing sequence on exit * 9fc1391552 arm64: proton-pack: Add new CPUs 'k' values for branch mitigation * 6e52d043f7 arm64: bpf: Only mitigate cBPF programs loaded by unprivileged users * 8fe5c37b0e arm64: bpf: Add BHB mitigation to the epilogue for cBPF programs * 4977712341 arm64: proton-pack: Expose whether the branchy loop k value * 351a505eb4 arm64: proton-pack: Expose whether the platform is mitigated by firmware * cc0b8e148c arm64: insn: Add support for encoding DSB * 361dfa7f5c Revert "net: phy: microchip: force IRQ polling mode for lan88xx" * b82c386898 io_uring: ensure deferred completions are posted for multishot * 95b9acb0bb io_uring: always arm linked timeouts prior to issue * 0e42a14899 do_umount(): add missing barrier before refcount checks in sync case * 8642cbf11e nvme: unblock ctrl state transition for firmware update * bd68de433f drm/panel: simple: Update timings for AUO G101EVN010 * d189b461d5 MIPS: Fix MAX_REG_OFFSET * ea25ee0bb4 iio: adc: dln2: Use aligned_s64 for timestamp * b6c984f4eb iio: accel: adxl355: Make timestamp 64-bit aligned using aligned_s64 * 8f0064eb22 types: Complement the aligned types with signed 64-bit one * 35061dc5f6 iio: temp: maxim-thermocouple: Fix potential lack of DMA safe buffer. * 6f371b751b iio: accel: adxl367: fix setting odr for activity time update * 7591a2e6c0 usb: usbtmc: Fix erroneous generic_read ioctl return * 5f72912d35 usb: usbtmc: Fix erroneous wait_srq ioctl return * a647d960fb usb: usbtmc: Fix erroneous get_stb ioctl error returns * 1956c3d878 USB: usbtmc: use interruptible sleep in usbtmc_read * 076ab0631e usb: typec: ucsi: displayport: Fix NULL pointer access * 2e89025609 usb: typec: tcpm: delay SNK_TRY_WAIT_DEBOUNCE to SRC_TRYWAIT transition * 7d6224d1cf usb: host: tegra: Prevent host controller crash when OTG port is used * 6fe2677bcf usb: gadget: tegra-xudc: ACK ST_RC after clearing CTRL_RUN * ee51a5d322 usb: cdnsp: fix L1 resume issue for RTL_REVISION_NEW_LPM version * 0554dade57 usb: cdnsp: Fix issue with resuming from L1 * 4c3a0b0b23 ocfs2: stop quota recovery before disabling quotas * 6e5c3d9f29 ocfs2: implement handshaking with ocfs2 recovery thread * c77a473d6e ocfs2: switch osb->disable_recovery to enum * 9e7b49ce4f module: ensure that kobject_put() is safe for module type kobjects * 8b02f85e84 xenbus: Use kref to track req lifetime * cf61669c50 usb: uhci-platform: Make the clock really optional * b04cfc229a drm/amdgpu/hdp5.2: use memcfg register to post the write for HDP flush * 470f56fc35 drm/amd/display: Copy AUX read reply data whenever length > 0 * 9e83c84de3 drm/amd/display: Fix wrong handling for AUX_DEFER case * 2cca631283 drm/amd/display: Remove incorrect checking in dmub aux handler * f3385a056a drm/amd/display: Fix the checking condition in dmub aux handling * 5235b56b7e drm/v3d: Add job to pending list if the reset was skipped * 16857370b3 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_tagged_fifo * 6c4a500061 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_fifo * 2c66239cbf iio: adis16201: Correct inclinometer channel resolution * 06acabd59b iio: adc: ad7606: fix serial register access * 30a4efc067 drm/amd/display: Shift DMUB AUX reply command if necessary * 02ad4ce144 x86/mm: Eliminate window where TLB flushes may be inadvertently skipped * 651d9b7d47 staging: axis-fifo: Correct handling of tx_fifo_depth for size validation * 0a73a6ac5f staging: axis-fifo: Remove hardware resets for user errors * 0f2c03bc1d staging: iio: adc: ad7816: Correct conditional logic for store mode * a92a9a4a33 Input: synaptics - enable InterTouch on TUXEDO InfinityBook Pro 14 v5 * 4e904ea41f Input: synaptics - enable SMBus for HP Elitebook 850 G1 * 7905a5fd76 Input: synaptics - enable InterTouch on Dell Precision M3800 * ed506876c5 Input: synaptics - enable InterTouch on Dynabook Portege X30L-G * f69db59eec Input: synaptics - enable InterTouch on Dynabook Portege X30-D * 334d74a798 Input: mtk-pmic-keys - fix possible null pointer dereference * 03d71e1b24 net: dsa: b53: fix learning on VLAN unaware bridges * 3379b3ca2c net: dsa: b53: always rejoin default untagged VLAN on bridge leave * 4dc610122c net: dsa: b53: fix VLAN ID for untagged vlan on bridge leave * 55c845e76f net: dsa: b53: fix flushing old pvid VLAN on pvid change * 7f622ae738 net: dsa: b53: fix clearing PVID of a port * aad87c94be net: dsa: b53: allow leaky reserved multicast * de1067cc8c bpf: Scrub packet on bpf_redirect_peer * aa77294b0f netfilter: ipset: fix region locking in hash types * 7d0032112a ipvs: fix uninit-value for saddr in do_output_route4 * 6e67f25c11 ipv4: Drop tos parameter from flowi4_update_output() * 21988c712a can: gw: fix RCU/BH usage in cgw_create_job() * 3df065841c rcu/kvfree: Add kvfree_rcu_mightsleep() and kfree_rcu_mightsleep() * e50ee08faf can: mcp251xfd: fix TDC setting for low data bit rates * a51dc9669f gre: Fix again IPv6 link-local address generation. * c928dd4f6b sch_htb: make htb_deactivate() idempotent * facf22c1a3 ksmbd: fix memory leak in parse_lease_state() * bca8df998c openvswitch: Fix unsafe attribute parsing in output_userspace() * 7f61da79df ksmbd: prevent out-of-bounds stream writes by validating *pos * 7fbb439ee2 can: mcp251xfd: mcp251xfd_remove(): fix order of unregistration calls * 0de5d055d4 can: mcan: m_can_class_unregister(): fix order of unregistration calls * 9f9d1ddee8 arm64: dts: imx8mm-verdin: Link reg_usdhc2_vqmmc to usdhc2 * b173204aad dm: add missing unlock on in dm_keyslot_evict() Change-Id: Ibf2bcf5be1d871f03b6b19cd8bd8d1c3cd240fa5 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-06-22 07:19:08 -07:00
Arnd Bergmann	d8780220fd	UPSTREAM: scripts/unifdef: avoid constexpr keyword ... Starting with c23, 'constexpr' is a keyword in C like in C++ and cannot be used as an identifier: scripts/unifdef.c:206:25: error: 'constexpr' can only be used in variable declarations 206 | static bool constexpr; /* constant #if expression */ | ^ scripts/unifdef.c:880:13: error: expected identifier or '(' 880 | constexpr = false; | ^ Rename this instance to allow changing to C23 at some point in the future. Bug: 401172689 Bug: 422603167 Change-Id: I19e1c13f5dcffe98b8189d3317100f20774f1d4c Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-By: Tony Finch <dot@dotat.at> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> (cherry picked from commit 10f94d8fcc0880c93d7697184fe199022792a61c) Signed-off-by: Srinivasarao Pathipati <quic_c_spathi@quicinc.com> (cherry picked from commit b7fd55a297a77e72154def86b46c3d1cf1ffa1e1)	2025-06-05 08:48:52 -07:00
Greg Kroah-Hartman	ef60b4555d	Merge 6.1.141 into android14-6.1-lts ... Changes in 6.1.141 gpio: pca953x: Add missing header(s) gpio: pca953x: Split pca953x_restore_context() and pca953x_save_context() gpio: pca953x: Simplify code with cleanup helpers gpio: pca953x: fix IRQ storm on system wake up phy: renesas: rcar-gen3-usb2: Add support to initialize the bus phy: renesas: rcar-gen3-usb2: Move IRQ request in probe phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off scsi: target: iscsi: Fix timeout on deleted connection virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN dma-mapping: avoid potential unused data compilation warning cgroup: Fix compilation issue due to cgroup_mutex not being exported scsi: mpi3mr: Add level check to control event logging net: enetc: refactor bulk flipping of RX buffers to separate function drm/amdgpu: Allow P2P access through XGMI selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure bpf: fix possible endless loop in BPF map iteration samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora kconfig: merge_config: use an empty file as initfile s390/vfio-ap: Fix no AP queue sharing allowed message written to kernel log cifs: Add fallback for SMB2 CREATE without FILE_READ_ATTRIBUTES cifs: Fix querying and creating MF symlinks over SMB1 cifs: Fix negotiate retry functionality fuse: Return EPERM rather than ENOSYS from link() NFSv4: Check for delegation validity in nfs_start_delegation_return_locked() NFS: Don't allow waiting for exiting tasks SUNRPC: Don't allow waiting for exiting tasks arm64: Add support for HIP09 Spectre-BHB mitigation tracing: Mark binary printing functions with __printf() attribute mailbox: use error ret code of of_parse_phandle_with_args() fbdev: fsl-diu-fb: add missing device_remove_file() fbcon: Use correct erase colour for clearing in fbcon fbdev: core: tileblit: Implement missing margin clearing for tileblit cifs: Fix establishing NetBIOS session for SMB2+ connection NFSv4: Treat ENETUNREACH errors as fatal for state recovery SUNRPC: rpc_clnt_set_transport() must not change the autobind setting SUNRPC: rpcbind should never reset the port to the value '0' thermal/drivers/qoriq: Power down TMU on system suspend dql: Fix dql->limit value when reset. lockdep: Fix wait context check on softirq for PREEMPT_RT objtool: Properly disable uaccess validation PCI: dwc: ep: Ensure proper iteration over outbound map windows tools/build: Don't pass test log files to linker pNFS/flexfiles: Report ENETDOWN as a connection error PCI: vmd: Disable MSI remapping bypass under Xen libnvdimm/labels: Fix divide error in nd_label_data_init() mmc: host: Wait for Vdd to settle on card power off x86/mm: Check return value from memblock_phys_alloc_range() i2c: qup: Vote for interconnect bandwidth to DRAM i2c: pxa: fix call balance of i2c->clk handling routines btrfs: make btrfs_discard_workfn() block_group ref explicit btrfs: avoid linker error in btrfs_find_create_tree_block() btrfs: run btrfs_error_commit_super() early btrfs: fix non-empty delayed iputs list on unmount due to async workers btrfs: get zone unusable bytes while holding lock at btrfs_reclaim_bgs_work() btrfs: send: return -ENAMETOOLONG when attempting a path that is too long drm/amd/display: Guard against setting dispclk low for dcn31x i3c: master: svc: Fix missing STOP for master request dlm: make tcp still work in multi-link env um: Store full CSGSFS and SS register from mcontext um: Update min_low_pfn to match changes in uml_reserved ext4: reorder capability check last scsi: st: Tighten the page format heuristics with MODE SELECT scsi: st: ERASE does not change tape location vfio/pci: Handle INTx IRQ_NOTCONNECTED bpf: Return prog btf_id without capable check tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() rtc: rv3032: fix EERD location thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer ASoC: mediatek: mt6359: Add stub for mt6359_accdet_enable_jack_detect kbuild: fix argument parsing in scripts/config crypto: octeontx2 - suppress auth failure screaming due to negative tests dm: restrict dm device size to 2^63-512 bytes net/smc: use the correct ndev to find pnetid by pnetid table xen: Add support for XenServer 6.1 platform device pinctrl-tegra: Restore SFSEL bit when freeing pins ASoC: sun4i-codec: support hp-det-gpios property ext4: reject the 'data_err=abort' option in nojournal mode RDMA/uverbs: Propagate errors from rdma_lookup_get_uobject() posix-timers: Add cond_resched() to posix_timer_add() search loop timer_list: Don't use %pK through printk() netfilter: conntrack: Bound nf_conntrack sysctl writes arm64/mm: Check PUD_TYPE_TABLE in pud_bad() mmc: dw_mmc: add exynos7870 DW MMC support mmc: sdhci: Disable SD card clock before changing parameters hwmon: (dell-smm) Increment the number of fans ipv6: save dontfrag in cork drm/amd/display: calculate the remain segments for all pipes gfs2: Check for empty queue in run_queue auxdisplay: charlcd: Partially revert "Move hwidth and bwidth to struct hd44780_common" ASoC: qcom: sm8250: explicitly set format in sm8250_be_hw_params_fixup() iommu/amd/pgtbl_v2: Improve error handling cpufreq: tegra186: Share policy per cluster crypto: lzo - Fix compression buffer overrun arm64: tegra: p2597: Fix gpio for vdd-1v8-dis regulator powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 ALSA: seq: Improve data consistency at polling tcp: bring back NUMA dispersion in inet_ehash_locks_alloc() rtc: ds1307: stop disabling alarms on probe ieee802154: ca8210: Use proper setters and getters for bitwise types ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114 media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe() dm cache: prevent BUG_ON by blocking retries on failed device resumes orangefs: Do not truncate file size net: phylink: use pl->link_interface in phylink_expects_phy() remoteproc: qcom_wcnss: Handle platforms with only single power domain drm/amdgpu: Do not program AGP BAR regs under SRIOV in gfxhub_v1_0.c media: cx231xx: set device_caps for 417 pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned" net: ethernet: ti: cpsw_new: populate netdev of_node net: pktgen: fix mpls maximum labels list parsing perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type ALSA: hda/realtek: Enable PC beep passthrough for HP EliteBook 855 G7 ipv4: fib: Move fib_valid_key_len() to rtm_to_fib_config(). drm/rockchip: vop2: Add uv swap for cluster window media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map clk: imx8mp: inform CCF of maximum frequency of clocks x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2 hwmon: (gpio-fan) Add missing mutex locks ARM: at91: pm: fix at91_suspend_finish for ZQ calibration drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence fpga: altera-cvp: Increase credit timeout soc: apple: rtkit: Use high prio work queue soc: apple: rtkit: Implement OSLog buffers properly PCI: brcmstb: Expand inbound window size up to 64GB PCI: brcmstb: Add a softdep to MIP MSI-X driver firmware: arm_ffa: Set dma_mask for ffa devices net/mlx5: Avoid report two health errors on same syndrome selftests/net: have `gro.sh -t` return a correct exit code drm/amdkfd: KFD release_work possible circular locking leds: pwm-multicolor: Add check for fwnode_property_read_u32 net: ethernet: mtk_ppe_offload: Allow QinQ, double ETH_P_8021Q only net: xgene-v2: remove incorrect ACPI_PTR annotation bonding: report duplicate MAC address in all situations soc: ti: k3-socinfo: Do not use syscon helper to build regmap x86/build: Fix broken copy command in genimage.sh when making isoimage drm/amd/display: handle max_downscale_src_width fail check x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus() cpuidle: menu: Avoid discarding useful information media: adv7180: Disable test-pattern control on adv7180 libbpf: Fix out-of-bound read dm: fix unconditional IO throttle caused by REQ_PREFLUSH x86/kaslr: Reduce KASLR entropy on most x86 systems MIPS: Use arch specific syscall name match function genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core clocksource: mips-gic-timer: Enable counter when CPUs start scsi: mpt3sas: Send a diag reset if target reset fails wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 wifi: rtw89: fw: propagate error code from rtw89_h2c_tx() net: pktgen: fix access outside of user given buffer in pktgen_thread_write() EDAC/ie31200: work around false positive build warning i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA) serial: mctrl_gpio: split disable_ms into sync and no_sync APIs RDMA/core: Fix best page size finding when it can cross SG entries pmdomain: imx: gpcv2: use proper helper for property detection can: c_can: Use of_property_present() to test existence of DT property eth: mlx4: don't try to complete XDP frames in netpoll PCI: Fix old_size lower bound in calculate_iosize() too ACPI: HED: Always initialize before evged vxlan: Join / leave MC group after remote changes media: test-drivers: vivid: don't call schedule in loop net/mlx5: Modify LSB bitmask in temperature event to include only the first bit net/mlx5: Apply rate-limiting to high temperature warning ASoC: ops: Enforce platform maximum on initial value ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG ASoC: tas2764: Mark SW_RESET as volatile ASoC: tas2764: Power up/down amp on mute ops ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map smack: recognize ipv4 CIPSO w/o categories kunit: tool: Use qboot on QEMU x86_64 net/mlx4_core: Avoid impossible mlx4_db_alloc() order value clk: qcom: clk-alpha-pll: Do not use random stack value for recalc rate serial: sh-sci: Update the suspend/resume support phy: core: don't require set_mode() callback for phy_get_mode() to work drm/amdgpu: reset psp->cmd to NULL after releasing the buffer drm/amd/display: Initial psr_version with correct setting drm/amdgpu: enlarge the VBIOS binary size limit drm/amd/display/dm: drop hw_support check in amdgpu_dm_i2c_xfer() net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB net/mlx5e: set the tx_queue_len for pfifo_fast net/mlx5e: reduce rep rxq depth to 256 for ECPF wifi: mac80211: don't unconditionally call drv_mgd_complete_tx() wifi: mac80211: remove misplaced drv_mgd_complete_tx() call arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure(). r8152: add vendor/device ID pair for Dell Alienware AW1022z wifi: rtw88: Fix download_firmware_validate() for RTL8814AU clk: qcom: camcc-sm8250: Use clk_rcg2_shared_ops for some RCGs hwmon: (xgene-hwmon) use appropriate type for the latency value media: qcom: camss: csid: Only add TPG v4l2 ctrl if TPG hardware is available vxlan: Annotate FDB data races r8169: don't scan PHY addresses > 0 rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y rcu: handle unstable rdp in rcu_read_unlock_strict() rcu: fix header guard for rcu_all_qs() perf: Avoid the read if the count is already updated ice: count combined queues using Rx/Tx count net/mana: fix warning in the writer of client oob scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine scsi: lpfc: Free phba irq in lpfc_sli4_enable_msi() when pci_irq_vector() fails scsi: st: Restore some drive settings after reset HID: usbkbd: Fix the bit shift number for LED_KANA ASoC: codecs: pcm3168a: Allow for 24-bit in provider mode drm/ast: Find VBIOS mode from regular display size bpftool: Fix readlink usage in get_fd_type perf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt wifi: rtl8xxxu: retry firmware download on error wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate wifi: rtw89: add wiphy_lock() to work that isn't held wiphy_lock() yet spi: zynqmp-gqspi: Always acknowledge interrupts regulator: ad5398: Add device tree support wifi: ath9k: return by of_get_mac_address drm/atomic: clarify the rules around drm_atomic_state->allow_modeset drm/panel-edp: Add Starry 116KHD024006 drm: Add valid clones check ASoC: imx-card: Adjust over allocation of memory in imx_card_parse_of() pinctrl: meson: define the pull up/down resistor value as 60 kOhm ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013 ALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx nvmet-tcp: don't restore null sk_state_change io_uring/fdinfo: annotate racy sq/cq head/tail reads btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref wifi: iwlwifi: add support for Killer on MTL xenbus: Allow PVH dom0 a non-local xenstore __legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock espintcp: remove encap socket caching to avoid reference leak dmaengine: idxd: add per DSA wq workqueue for processing cr faults dmaengine: idxd: add idxd_copy_cr() to copy user completion record during page fault handling dmaengine: idxd: Fix allowing write() from different address spaces remoteproc: qcom_wcnss: Fix on platforms without fallback regulators clk: sunxi-ng: d1: Add missing divider for MMC mod clocks xfrm: Sanitize marks before insert dmaengine: idxd: Fix ->poll() return value Bluetooth: L2CAP: Fix not checking l2cap_chan security level bridge: netfilter: Fix forwarding of fragmented packets ice: fix vf->num_mac count with port representors net: dwmac-sun8i: Use parsed internal PHY address instead of 1 net: lan743x: Restore SGMII CTRL register on resume io_uring: fix overflow resched cqe reordering sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() octeontx2-pf: Add support for page pool octeontx2-pf: Add AF_XDP non-zero copy support net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done octeontx2-af: Set LMT_ENA bit for APR table entries octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG crypto: algif_hash - fix double free in hash_accept padata: do not leak refcount in reorder_work can: slcan: allow reception of short error messages can: bcm: add locking for bcm_op runtime updates can: bcm: add missing rcu read protection for procfs content ALSA: pcm: Fix race of buffer access at PCM OSS layer ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10 llc: fix data loss when reading from a socket in llc_ui_recvmsg() platform/x86: dell-wmi-sysman: Avoid buffer overflow in current_password_store() drm/edid: fixed the bug that hdr metadata was not reset smb: client: Fix use-after-free in cifs_fill_dirent smb: client: Reset all search buffer pointers when releasing buffer Revert "drm/amd: Keep display off while going into S4" memcg: always call cond_resched() after fn() mm/page_alloc.c: avoid infinite retries caused by cpuset race Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection" ksmbd: fix stream write failure spi: spi-fsl-dspi: restrict register range for regmap access spi: spi-fsl-dspi: Halt the module after a new message transfer spi: spi-fsl-dspi: Reset SR flags before sending a new message kbuild: Disable -Wdefault-const-init-unsafe serial: sh-sci: Save and restore more registers pinctrl: tegra: Fix off by one in tegra_pinctrl_get_group() i3c: master: svc: Fix implicit fallthrough in svc_i3c_master_ibi_work() x86/mm/init: Handle the special case of device private pages in add_pages(), to not increase max_pfn and trigger dma_addressing_limited() bounce buffers bounce buffers dmaengine: idxd: Fix passing freed memory in idxd_cdev_open() octeontx2-pf: fix page_pool creation fail for rings > 32k octeontx2-pf: Fix page pool cache index corruption. octeontx2-pf: Fix page pool frag allocation warning hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING btrfs: check folio mapping after unlock in relocate_one_folio() af_unix: Kconfig: make CONFIG_UNIX bool af_unix: Return struct unix_sock from unix_get_socket(). af_unix: Run GC on only one CPU. af_unix: Try to run GC async. af_unix: Replace BUG_ON() with WARN_ON_ONCE(). af_unix: Remove io_uring code for GC. af_unix: Remove CONFIG_UNIX_SCM. af_unix: Allocate struct unix_vertex for each inflight AF_UNIX fd. af_unix: Allocate struct unix_edge for each inflight AF_UNIX fd. af_unix: Link struct unix_edge when queuing skb. af_unix: Bulk update unix_tot_inflight/unix_inflight when queuing skb. af_unix: Iterate all vertices by DFS. af_unix: Detect Strongly Connected Components. af_unix: Save listener for embryo socket. af_unix: Fix up unix_edge.successor for embryo socket. af_unix: Save O(n) setup of Tarjan's algo. af_unix: Skip GC if no cycle exists. af_unix: Avoid Tarjan's algorithm if unnecessary. af_unix: Assign a unique index to SCC. af_unix: Detect dead SCC. af_unix: Replace garbage collection algorithm. af_unix: Remove lock dance in unix_peek_fds(). af_unix: Try not to hold unix_gc_lock during accept(). af_unix: Don't access successor in unix_del_edges() during GC. af_unix: Add dead flag to struct scm_fp_list. af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS af_unix: Fix uninit-value in __unix_walk_scc() arm64: dts: qcom: sm8350: Fix typo in pil_camera_mem node net_sched: hfsc: Address reentrant enqueue adding class to eltree twice perf/arm-cmn: Fix REQ2/SNP2 mixup perf/arm-cmn: Initialise cmn->cpu earlier coredump: fix error handling for replace_fd() pid: add pidfd_prepare() fork: use pidfd_prepare() coredump: hand a pidfd to the usermode coredump helper HID: quirks: Add ADATA XPG alpha wireless mouse support nfs: don't share pNFS DS connections between net namespaces platform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS um: let 'make clean' properly clean underlying SUBARCH as well spi: spi-sun4i: fix early activation nvme-pci: add NVME_QUIRK_NO_DEEPEST_PS quirk for SOLIDIGM P44 Pro NFS: Avoid flushing data while holding directory locks in nfs_rename() platform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys platform/x86: thinkpad_acpi: Ignore battery threshold change event notification net: ethernet: ti: am65-cpsw: Lower random mac address error print to info Linux 6.1.141 Change-Id: I4b93f8e69385f2087bf71545f58ae6f5cee1c5ba Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-06-05 07:17:16 +00:00
Seyediman Seyedarab	df5a4416c0	kbuild: fix argument parsing in scripts/config ... [ Upstream commit f757f6011c92b5a01db742c39149bed9e526478f ] The script previously assumed --file was always the first argument, which caused issues when it appeared later. This patch updates the parsing logic to scan all arguments to find --file, sets the config file correctly, and resets the argument list with the remaining commands. It also fixes --refresh to respect --file by passing KCONFIG_CONFIG=$FN to make oldconfig. Signed-off-by: Seyediman Seyedarab <imandevel@gmail.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-06-04 14:40:06 +02:00
Daniel Gomez	53dd81d7ba	kconfig: merge_config: use an empty file as initfile ... [ Upstream commit a26fe287eed112b4e21e854f173c8918a6a8596d ] The scripts/kconfig/merge_config.sh script requires an existing $INITFILE (or the $1 argument) as a base file for merging Kconfig fragments. However, an empty $INITFILE can serve as an initial starting point, later referenced by the KCONFIG_ALLCONFIG Makefile variable if -m is not used. This variable can point to any configuration file containing preset config symbols (the merged output) as stated in Documentation/kbuild/kconfig.rst. When -m is used $INITFILE will contain just the merge output requiring the user to run make (i.e. KCONFIG_ALLCONFIG=<$INITFILE> make <allnoconfig/alldefconfig> or make olddefconfig). Instead of failing when `$INITFILE` is missing, create an empty file and use it as the starting point for merges. Signed-off-by: Daniel Gomez <da.gomez@samsung.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-06-04 14:40:02 +02:00
Greg Kroah-Hartman	e63ea17387	Merge 6.1.136 into android14-6.1-lts ... Changes in 6.1.136 module: sign with sha512 instead of sha1 by default tracing: Add __cpumask to denote a trace event field that is a cpumask_t tracing: Fix cpumask() example typo tracing: Add __string_len() example tracing: Add __print_dynamic_array() helper tracing: Verify event formats that have "%*p.." auxdisplay: hd44780: Convert to platform remove callback returning void auxdisplay: hd44780: Fix an API misuse in hd44780.c net: dsa: mv88e6xxx: don't dispose of Global2 IRQ mappings from mdiobus code net: dsa: add support for mac_prepare() and mac_finish() calls net: dsa: mv88e6xxx: move link forcing to mac_prepare/mac_finish net: dsa: mv88e6xxx: pass directly chip structure to mv88e6xxx_phy_is_internal net: dsa: mv88e6xxx: add field to specify internal phys layout net: dsa: mv88e6xxx: fix internal PHYs for 6320 family net: dsa: mv88e6xxx: fix VTU methods for 6320 family iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check iio: adc: ad7768-1: Fix conversion result sign backlight: led_bl: Convert to platform remove callback returning void backlight: led_bl: Hold led_access lock when calling led_sysfs_disable() clk: renesas: rzg2l: Use u32 for flag and mux_flags clk: renesas: rzg2l: Add struct clk_hw_data clk: renesas: rzg2l: Remove CPG_SDHI_DSEL from generic header clk: renesas: rzg2l: Refactor SD mux driver clk: renesas: r9a07g04[34]: Use SEL_SDHI1_STS status configuration for SD1 mux clk: renesas: r9a07g04[34]: Fix typo for sel_shdi variable clk: renesas: r9a07g043: Fix HP clock source for RZ/Five of: resolver: Simplify of_resolve_phandles() using __free() of: resolver: Fix device node refcount leakage in of_resolve_phandles() PCI: Assign PCI domain IDs by ida_alloc() PCI: Fix reference leak in pci_register_host_bridge() phy: freescale: imx8m-pcie: Add i.MX8MP PCIe PHY support phy: freescale: imx8m-pcie: assert phy reset and perst in power off ASoC: qcom: q6dsp: add support to more display ports ASoC: qcom: Fix sc7280 lpass potential buffer overflow selftests/mm: generate a temporary mountpoint for cgroup filesystem dma/contiguous: avoid warning about unused size_bytes cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate() cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() cpufreq: cppc: Fix invalid return value in .get() callback btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range() scsi: core: Clear flags for scsi_cmnd that did not complete net: lwtunnel: disable BHs when required net: phy: leds: fix memory leak tipc: fix NULL pointer dereference in tipc_mon_reinit_self() net_sched: hfsc: Fix a UAF vulnerability in class handling net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE perf/x86: Fix non-sampling (counting) events on certain x86 platforms LoongArch: Select ARCH_USE_MEMTEST LoongArch: Make regs_irqs_disabled() more clear wifi: mac80211: export ieee80211_purge_tx_queue() for drivers wifi: rtw88: use ieee80211_purge_tx_queue() to purge TX skb virtio_console: fix missing byte order handling for cols and rows xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() net: selftests: initialize TCP header and skb payload with zero drm/amd/display: Fix gpu reset in multidisplay config drm/amd/display: Force full update in gpu reset LoongArch: Return NULL from huge_pte_offset() for invalid PMD LoongArch: Remove a bogus reference to ZONE_DMA KVM: SVM: Allocate IR data using atomic allocation mcb: fix a double free bug in chameleon_parse_gdd() USB: storage: quirk for ADATA Portable HDD CH94 mei: me: add panther lake H DID KVM: x86: Explicitly treat routing entry type changes as changes KVM: x86: Reset IRTE to host control if *new* route isn't postable misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack serial: msm: Configure correct working mode before starting earlycon serial: sifive: lock port in startup()/shutdown() callbacks USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe USB: serial: option: add Sierra Wireless EM9291 USB: serial: simple: add OWON HDS200 series oscilloscope support usb: cdns3: Fix deadlock when using NCM gadget usb: chipidea: ci_hdrc_imx: fix usbmisc handling usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02) usb: dwc3: gadget: check that event count does not exceed event buffer length usb: dwc3: xilinx: Prevent spike in reset signal usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive USB: VLI disk crashes if LPM is used USB: wdm: handle IO errors in wdm_wwan_port_start USB: wdm: close race between wdm_open and wdm_wwan_port_stop USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context USB: wdm: add annotation pinctrl: renesas: rza2: Fix potential NULL pointer dereference MIPS: cm: Detect CM quirks from device tree crypto: null - Use spin lock instead of mutex bpf: Fix deadlock between rcu_tasks_trace and event_mutex. clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec() parisc: PDT: Fix missing prototype warning s390/sclp: Add check for get_zeroed_page() s390/tty: Fix a potential memory leak bug usb: host: max3421-hcd: Add missing spi_device_id table fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size usb: dwc3: gadget: Refactor loop to avoid NULL endpoints usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield sound/virtio: Fix cancel_sync warnings on uninitialized work_structs dmaengine: dmatest: Fix dmatest waiting less when interrupted usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func thunderbolt: Scan retimers after device router has been enumerated objtool: Silence more KCOV warnings objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler() objtool, lkdtm: Obfuscate the do_nothing() pointer qibfs: fix _another_ leak ntb: reduce stack usage in idt_scan_mws ntb_hw_amd: Add NTB PCI ID for new gen CPU 9p/net: fix improper handling of bogus negative read/write replies rtc: pcf85063: do a SW reset if POR failed sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP KVM: s390: Don't use %pK through tracepoints udmabuf: fix a buf size overflow issue during udmabuf creation selftests: ublk: fix test_stripe_04 xen: Change xen-acpi-processor dom0 dependency nvme: requeue namespace scan on missed AENs ACPI: EC: Set ec_no_wakeup for Lenovo Go S ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls nvme: re-read ANA log page after ns scan completes objtool: Stop UNRET validation on UD2 selftests/mincore: Allow read-ahead pages to reach the end of the file x86/bugs: Use SBPB in write_ibpb() if applicable x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline x86/bugs: Don't fill RSB on context switch with eIBRS nvmet-fc: take tgtport reference only once nvmet-fc: put ref when assoc->del_work is already scheduled ext4: make block validity check resistent to sb bh corruption scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init() scsi: pm80xx: Set phy_attached to zero when device is gone x86/i8253: Call clockevent_i8253_disable() with interrupts disabled loop: aio inherit the ioprio of original request spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts spi: tegra210-quad: add rate limiting and simplify timeout error message ubsan: Fix panic from test_ubsan_out_of_bounds md/raid1: Add check for missing source disk in process_checks() spi: spi-imx: Add check for spi_imx_setupxfer() of: module: add buffer overflow check in of_modalias() jfs: define xtree root and page independently comedi: jr3_pci: Fix synchronous deletion of timer crypto: atmel-sha204a - Set hwrng quality to lowest possible net/sched: act_mirred: don't override retval if we already lost the skb net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family net: dsa: mv88e6xxx: enable PVT for 6321 switch net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family net: dsa: mv88e6xxx: enable STU methods for 6320 family xdp: Reset bpf_redirect_info before running a xdp's BPF prog. MIPS: cm: Fix warning if MIPS_CM is disabled nvme: fixup scan failure for non-ANA multipath controllers phy: freescale: imx8m-pcie: Do CMN_RST just before PHY PLL lock check phy: freescale: imx8m-pcie: Add one missing error return tracing: Remove pointer (asterisk) and brackets from cpumask_t field PCI: Fix use-after-free in pci_bus_release_domain_nr() ASoC: qcom: q6afe-dai: fix Display Port Playback stream name objtool: Silence more KCOV warnings, part 2 Linux 6.1.136 Change-Id: I0649fe0aedec1cc3666200fb579b48f449380179 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-05-07 06:27:07 +00:00
Josh Poimboeuf	715b345153	objtool: Silence more KCOV warnings, part 2 ... commit 55c78035a1a8dfb05f1472018ce2a651701adb7d upstream. Similar to GCOV, KCOV can leave behind dead code and undefined behavior. Warnings related to those should be ignored. The previous commit: 6b023c784204 ("objtool: Silence more KCOV warnings") ... only did so for CONFIG_CGOV_KERNEL. Also do it for CONFIG_KCOV, but for real this time. Fixes the following warning: vmlinux.o: warning: objtool: synaptics_report_mt_data: unexpected end of section .text.synaptics_report_mt_data Fixes: 6b023c784204 ("objtool: Silence more KCOV warnings") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/a44ba16e194bcbc52c1cef3d3cd9051a62622723.1743481539.git.jpoimboe@kernel.org Closes: https://lore.kernel.org/oe-kbuild-all/202503282236.UhfRsF3B-lkp@intel.com/ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2025-05-02 07:47:10 +02:00
Jan Stancek	f331105699	sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3 ... commit 558bdc45dfb2669e1741384a0c80be9c82fa052c upstream. ENGINE API has been deprecated since OpenSSL version 3.0 [1]. Distros have started dropping support from headers and in future it will likely disappear also from library. It has been superseded by the PROVIDER API, so use it instead for OPENSSL MAJOR >= 3. [1] https://github.com/openssl/openssl/blob/master/README-ENGINES.md [jarkko: fixed up alignment issues reported by checkpatch.pl --strict] Signed-off-by: Jan Stancek <jstancek@redhat.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com> Reviewed-by: Neal Gompa <neal@gompa.dev> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2025-04-25 10:44:04 +02:00
Jan Stancek	6e3319a2e0	sign-file,extract-cert: avoid using deprecated ERR_get_error_line() ... commit 467d60eddf55588add232feda325da7215ddaf30 upstream. ERR_get_error_line() is deprecated since OpenSSL 3.0. Use ERR_peek_error_line() instead, and combine display_openssl_errors() and drain_openssl_errors() to a single function where parameter decides if it should consume errors silently. Signed-off-by: Jan Stancek <jstancek@redhat.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com> Reviewed-by: Neal Gompa <neal@gompa.dev> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2025-04-25 10:44:04 +02:00
Jan Stancek	3437e90d15	sign-file,extract-cert: move common SSL helper functions to a header ... commit 300e6d4116f956b035281ec94297dc4dc8d4e1d3 upstream. Couple error handling helpers are repeated in both tools, so move them to a common header. Signed-off-by: Jan Stancek <jstancek@redhat.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com> Reviewed-by: Neal Gompa <neal@gompa.dev> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2025-04-25 10:44:04 +02:00
Greg Kroah-Hartman	522ff9a1db	Merge 6.1.134 into android14-6.1-lts ... Changes in 6.1.134 watch_queue: fix pipe accounting mismatch x86/mm/pat: cpa-test: fix length for CPA_ARRAY test cpufreq: scpi: compare kHz instead of Hz smack: dont compile ipv6 code unless ipv6 is configured cpufreq: governor: Fix negative 'idle_time' handling in dbs_update() x86/fpu: Fix guest FPU state buffer allocation size x86/fpu: Avoid copying dynamic FP state from init_task in arch_dup_task_struct() x86/platform: Only allow CONFIG_EISA for 32-bit x86/sev: Add missing RIP_REL_REF() invocations during sme_enable() lockdep/mm: Fix might_fault() lockdep check of current->mm->mmap_lock PM: sleep: Adjust check before setting power.must_resume selinux: Chain up tool resolving errors in install_policy.sh EDAC/ie31200: Fix the size of EDAC_MC_LAYER_CHIP_SELECT layer EDAC/ie31200: Fix the DIMM size mask for several SoCs EDAC/ie31200: Fix the error path order of ie31200_init() thermal: int340x: Add NULL check for adev PM: sleep: Fix handling devices with direct_complete set on errors lockdep: Don't disable interrupts on RT in disable_irq_nosync_lockdep.*() perf/ring_buffer: Allow the EPOLLRDNORM flag for poll x86/fpu/xstate: Fix inconsistencies in guest FPU xfeatures media: verisilicon: HEVC: Initialize start_bit field media: platform: allgro-dvt: unregister v4l2_device on the error path ASoC: cs35l41: check the return value from spi_setup() HID: remove superfluous (and wrong) Makefile entry for CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER ALSA: hda/realtek: Always honor no_shutup_pins ASoC: ti: j721e-evm: Fix clock configuration for ti,j7200-cpb-audio compatible drm/bridge: ti-sn65dsi86: Fix multiple instances drm/dp_mst: Fix drm RAD print drm/bridge: it6505: fix HDCP V match check is not performed correctly drm: xlnx: zynqmp: Fix max dma segment size drm/vkms: Fix use after free and double free on init error PCI: Use downstream bridges for distributing resources drm/mediatek: mtk_hdmi: Unregister audio platform device on failure drm/mediatek: mtk_hdmi: Fix typo for aud_sampe_size member PCI/ASPM: Fix link state exit during switch upstream function removal drm/msm/dsi: Set PHY usescase (and mode) before registering DSI host PCI: cadence-ep: Fix the driver to send MSG TLP for INTx without data payload PCI: brcmstb: Use internal register to change link capability PCI: brcmstb: Fix error path after a call to regulator_bulk_get() PCI: brcmstb: Fix potential premature regulator disabling PCI/portdrv: Only disable pciehp interrupts early when needed PCI: Avoid reset when disabled via sysfs drm/amd/display: fix type mismatch in CalculateDynamicMetadataParameters() PCI: Remove stray put_device() in pci_register_host_bridge() PCI: xilinx-cpm: Fix IRQ domain leak in error path of probe drm/mediatek: dsi: fix error codes in mtk_dsi_host_transfer() drm/amd/display: avoid NPD when ASIC does not support DMUB PCI: pciehp: Don't enable HPIE when resuming in poll mode fbdev: au1100fb: Move a variable assignment behind a null pointer check mdacon: rework dependency list fbdev: sm501fb: Add some geometry checks. clk: amlogic: gxbb: drop incorrect flag on 32k clock crypto: hisilicon/sec2 - fix for aead authsize alignment remoteproc: core: Clear table_sz when rproc_shutdown of: property: Increase NR_FWNODE_REFERENCE_ARGS remoteproc: qcom_q6v5_pas: Make single-PD handling more robust libbpf: Fix hypothetical STT_SECTION extern NULL deref case selftests/bpf: Fix string read in strncmp benchmark clk: samsung: Fix UBSAN panic in samsung_clk_init() clk: qcom: gcc-msm8953: fix stuck venus0_core0 clock bpf: Use preempt_count() directly in bpf_send_signal_common() lib: 842: Improve error handling in sw842_compress() pinctrl: renesas: rza2: Fix missing of_node_put() call pinctrl: renesas: rzg2l: Fix missing of_node_put() call clk: rockchip: rk3328: fix wrong clk_ref_usb3otg parent RDMA/core: Don't expose hw_counters outside of init net namespace RDMA/mlx5: Fix calculation of total invalidated pages RDMA/erdma: Prevent use-after-free in erdma_accept_newconn() remoteproc: qcom_q6v5_mss: Handle platforms with one power domain IB/mad: Check available slots before posting receive WRs pinctrl: tegra: Set SFIO mode to Mux Register clk: amlogic: g12b: fix cluster A parent data clk: amlogic: gxbb: drop non existing 32k clock parent selftests/bpf: Select NUMA_NO_NODE to create map clk: amlogic: g12a: fix mmc A peripheral clock x86/entry: Fix ORC unwinder for PUSH_REGS with save_ret=1 power: supply: max77693: Fix wrong conversion of charge input threshold value crypto: nx - Fix uninitialised hv_nxc on error RDMA/mlx5: Fix mlx5_poll_one() cur_qp update flow pinctrl: renesas: rzv2m: Fix missing of_node_put() call mfd: sm501: Switch to BIT() to mitigate integer overflows x86/dumpstack: Fix inaccurate unwinding from exception stacks due to misplaced assignment crypto: hisilicon/sec2 - fix for aead auth key length clk: qcom: mmcc-sdm660: fix stuck video_subcore0 clock isofs: fix KMSAN uninit-value bug in do_isofs_readdir() soundwire: slave: fix an OF node reference leak in soundwire slave device coresight: catu: Fix number of pages while using 64k pages coresight-etm4x: add isb() before reading the TRCSTATR iio: accel: mma8452: Ensure error return on failure to matching oversampling ratio iio: accel: msa311: Fix failure to release runtime pm if direct mode claim fails. usb: xhci: correct debug message page size calculation fs/ntfs3: Fix a couple integer overflows on 32bit systems iio: adc: ad7124: Fix comparison of channel configs perf evlist: Add success path to evlist__create_syswide_maps perf units: Fix insufficient array space kexec: initialize ELF lowest address to ULONG_MAX ocfs2: validate l_tree_depth to avoid out-of-bounds access arch/powerpc: drop GENERIC_PTDUMP from mpc885_ads_defconfig NFSv4: Don't trigger uneccessary scans for return-on-close delegations fuse: fix dax truncate/punch_hole fault path um: remove copy_from_kernel_nofault_allowed i3c: master: svc: Fix missing the IBI rules perf python: Fixup description of sample.id event member perf python: Decrement the refcount of just created event on failure perf python: Don't keep a raw_data pointer to consumed ring buffer space perf python: Check if there is space to copy all the event staging: rtl8723bs: select CONFIG_CRYPTO_LIB_AES fs/procfs: fix the comment above proc_pid_wchan() perf tools: annotate asm_pure_loop.S objtool, media: dib8000: Prevent divide-by-zero in dib8000_set_dds() exfat: fix the infinite loop in exfat_find_last_cluster() rtnetlink: Allocate vfinfo size for VF GUIDs when supported rndis_host: Flag RNDIS modems as WWAN devices ksmbd: use aead_request_free to match aead_request_alloc ksmbd: fix multichannel connection failure net/mlx5e: SHAMPO, Make reserved size independent of page size ring-buffer: Fix bytes_dropped calculation issue LoongArch: Fix help text of CMDLINE_EXTEND in Kconfig ACPI: processor: idle: Return an error if both P_LVL{2,3} idle states are invalid octeontx2-af: Fix mbox INTR handler when num VFs > 64 octeontx2-af: Free NIX_AF_INT_VEC_GEN irq sched/smt: Always inline sched_smt_active() context_tracking: Always inline ct_{nmi,irq}_{enter,exit}() rcu-tasks: Always inline rcu_irq_work_resched() wifi: iwlwifi: fw: allocate chained SG tables for dump wifi: iwlwifi: mvm: use the right version of the rate API nvme-tcp: fix possible UAF in nvme_tcp_poll nvme-pci: clean up CMBMSC when registering CMB fails nvme-pci: skip CMB blocks incompatible with PCI P2P DMA wifi: brcmfmac: keep power during suspend if board requires it affs: generate OFS sequence numbers starting at 1 affs: don't write overlarge OFS data block size fields ALSA: hda/realtek: Fix Asus Z13 2025 audio ALSA: hda: Fix speakers on ASUS EXPERTBOOK P5405CSA 1.0 platform/x86: intel-hid: fix volume buttons on Microsoft Surface Go 4 tablet HID: i2c-hid: improve i2c_hid_get_report error message ALSA: hda/realtek: Add support for ASUS ROG Strix G614 Laptops using CS35L41 HDA ALSA: hda/realtek: Add support for ASUS Zenbook UM3406KA Laptops using CS35L41 HDA sched/deadline: Use online cpus for validating runtime locking/semaphore: Use wake_q to wake up processes outside lock critical section x86/sgx: Warn explicitly if X86_FEATURE_SGX_LC is not enabled drm/amd: Keep display off while going into S4 ALSA: hda/realtek: Add mute LED quirk for HP Pavilion x360 14-dy1xxx can: statistics: use atomic access in hot path memory: omap-gpmc: drop no compatible check hwmon: (nct6775-core) Fix out of bounds access for NCT679{8,9} spufs: fix a leak on spufs_new_file() failure spufs: fix gang directory lifetimes spufs: fix a leak in spufs_create_context() riscv: ftrace: Add parentheses in macro definitions of make_call_t0 and make_call_ra ntb_hw_switchtec: Fix shift-out-of-bounds in switchtec_ntb_mw_set_trans ntb: intel: Fix using link status DB's ASoC: imx-card: Add NULL check in imx_card_probe() netfilter: nft_set_hash: GC reaps elements with conncount for dynamic sets only netlabel: Fix NULL pointer exception caused by CALIPSO on IPv4 sockets net_sched: skbprio: Remove overly strict queue assertions net: mvpp2: Prevent parser TCAM memory corruption udp: Fix memory accounting leak. vsock: avoid timeout during connect() if the socket is closing tunnels: Accept PACKET_HOST in skb_tunnel_check_pmtu(). netfilter: nft_tunnel: fix geneve_opt type confusion addition ipv6: fix omitted netlink attributes when using RTEXT_FILTER_SKIP_STATS net: dsa: mv88e6xxx: propperly shutdown PPU re-enable timer on destroy net: fix geneve_opt length integer overflow ipv6: Start path selection from the first nexthop ipv6: Do not consider link down nexthops in path selection arcnet: Add NULL check in com20020pci_probe() io_uring/filetable: ensure node switch is always done, if needed drm/amdgpu/gfx11: fix num_mec tty: serial: fsl_lpuart: use UARTMODIR register bits for lpuart32 platform tty: serial: fsl_lpuart: disable transmitter before changing RS485 related registers usbnet:fix NPE during rx_complete LoongArch: Increase ARCH_DMA_MINALIGN up to 16 LoongArch: BPF: Fix off-by-one error in build_prologue() LoongArch: BPF: Use move_addr() for BPF_PSEUDO_FUNC platform/x86: ISST: Correct command storage data length ntb_perf: Delete duplicate dmaengine_unmap_put() call in perf_copy_chunk() perf/x86/intel: Apply static call for drain_pebs perf/x86/intel: Avoid disable PMU if !cpuc->enabled in sample read kunit/overflow: Fix UB in overflow_allocation_test btrfs: handle errors from btrfs_dec_ref() properly x86/tsc: Always save/restore TSC sched_clock() on suspend/resume x86/mm: Fix flush_tlb_range() when used for zapping normal PMDs acpi: nfit: fix narrowing conversion in acpi_nfit_ctl ACPI: resource: Skip IRQ override on ASUS Vivobook 14 X1404VAP mmc: sdhci-pxav3: set NEED_RSP_BUSY capability mmc: sdhci-omap: Disable MMC_CAP_AGGRESSIVE_PM for eMMC/SD ksmbd: add bounds check for create lease context ksmbd: fix use-after-free in ksmbd_sessions_deregister() ksmbd: fix session use-after-free in multichannel connection ksmbd: validate zero num_subauth before sub_auth is accessed tracing: Fix use-after-free in print_graph_function_flags during tracer switching tracing: Ensure module defining synth event cannot be unloaded while tracing tracing: Fix synth event printk format for str fields tracing/osnoise: Fix possible recursive locking for cpus_read_lock() arm64: Don't call NULL in do_compat_alignment_fixup() ext4: don't over-report free space or inodes in statvfs ext4: fix OOB read when checking dotdot dir jfs: fix slab-out-of-bounds read in ea_get() jfs: add index corruption check to DT_GETPAGE() media: streamzap: fix race between device disconnection and urb callback nfsd: put dl_stid if fail to queue dl_recall NFSD: Skip sending CB_RECALL_ANY when the backchannel isn't up tracing: Do not use PERF enums when perf is not defined Linux 6.1.134 Change-Id: I839a629271fb53021a249cc4f69a668d78f723e3 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-04-16 13:05:15 +00:00
Greg Kroah-Hartman	e3b905a701	Merge 6.1.132 into android14-6.1-lts ... Changes in 6.1.132 clockevents/drivers/i8253: Fix stop sequence for timer 0 sched/isolation: Prevent boot crash when the boot CPU is nohz_full hrtimer: Use and report correct timerslack values for realtime tasks fs/ntfs3: Fix shift-out-of-bounds in ntfs_fill_super fbdev: hyperv_fb: iounmap() the correct memory when removing a device pinctrl: bcm281xx: Fix incorrect regmap max_registers value netfilter: nft_ct: Use __refcount_inc() for per-CPU nft_ct_pcpu_template. ice: fix memory leak in aRFS after reset netfilter: nf_conncount: garbage collection is not skipped when jiffies wrap around sched: address a potential NULL pointer dereference in the GRED scheduler. wifi: cfg80211: cancel wiphy_work before freeing wiphy Bluetooth: hci_event: Fix enabling passive scanning Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" net: dsa: mv88e6xxx: Verify after ATU Load ops net: mctp i2c: Copy headers if cloned netpoll: hold rcu read lock in __netpoll_send_skb() drm/hyperv: Fix address space leak when Hyper-V DRM device is removed Drivers: hv: vmbus: Don't release fb_mmio resource in vmbus_free_mmio() net/mlx5: handle errors in mlx5_chains_create_table() eth: bnxt: do not update checksum in bnxt_xdp_build_skb() net: switchdev: Convert blocking notification chain to a raw one bonding: fix incorrect MAC address setting to receive NS messages netfilter: nf_conncount: Fully initialize struct nf_conncount_tuple in insert_tree() ipvs: prevent integer overflow in do_ip_vs_get_ctl() net_sched: Prevent creation of classes with TC_H_ROOT netfilter: nft_exthdr: fix offset with ipv4_find_option() gre: Fix IPv6 link-local address generation. net: openvswitch: remove misbehaving actions length check net/mlx5: Bridge, fix the crash caused by LAG state check net/mlx5e: Prevent bridge link show failure for non-eswitch-allowed devices nvme-fc: go straight to connecting state when initializing hrtimers: Mark is_migration_base() with __always_inline powercap: call put_device() on an error path in powercap_register_control_type() iscsi_ibft: Fix UBSAN shift-out-of-bounds warning in ibft_attr_show_nic() scsi: core: Use GFP_NOIO to avoid circular locking dependency scsi: qla1280: Fix kernel oops when debug level > 2 ACPI: resource: IRQ override for Eluktronics MECH-17 smb: client: fix noisy when tree connecting to DFS interlink targets alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support vboxsf: fix building with GCC 15 HID: intel-ish-hid: fix the length of MNG_SYNC_FW_CLOCK in doorbell HID: intel-ish-hid: Send clock sync message immediately after reset HID: ignore non-functional sensor in HP 5MP Camera HID: hid-apple: Apple Magic Keyboard a3203 USB-C support HID: apple: fix up the F6 key on the Omoton KB066 keyboard sched: Clarify wake_up_q()'s write to task->wake_q.next platform/x86: thinkpad_acpi: Fix invalid fan speed on ThinkPad X120e platform/x86: thinkpad_acpi: Support for V9 DYTC platform profiles s390/cio: Fix CHPID "configure" attribute caching thermal/cpufreq_cooling: Remove structure member documentation Xen/swiotlb: mark xen_swiotlb_fixup() __init ALSA: hda/realtek: Limit mic boost on Positivo ARN50 ASoC: rsnd: don't indicate warning on rsnd_kctrl_accept_runtime() ASoC: rsnd: adjust convert rate limitation ASoC: arizona/madera: use fsleep() in up/down DAPM event delays. ASoC: SOF: Intel: hda: add softdep pre to snd-hda-codec-hdmi module net: wwan: mhi_wwan_mbim: Silence sequence number glitch errors nvme-pci: quirk Acer FA100 for non-uniqueue identifiers nvme-tcp: add basic support for the C2HTermReq PDU nvmet-rdma: recheck queue state is LIVE in state lock in recv done sctp: Fix undefined behavior in left shift operation nvme: only allow entering LIVE from CONNECTING state ASoC: tas2770: Fix volume scale ASoC: tas2764: Fix power control mask ASoC: tas2764: Set the SDOUT polarity correctly fuse: don't truncate cached, mutated symlink perf/x86/intel: Use better start period for frequency mode x86/irq: Define trace events conditionally mptcp: safety check before fallback drm/nouveau: Do not override forced connector status block: fix 'kmem_cache of name 'bio-108' already exists' io_uring: return error pointer from io_mem_alloc() io_uring: add ring freeing helper mm: add nommu variant of vm_insert_pages() io_uring: get rid of remap_pfn_range() for mapping rings/sqes io_uring: don't attempt to mmap larger than what the user asks for io_uring: fix corner case forgetting to vunmap xfs: pass refcount intent directly through the log intent code xfs: pass xfs_extent_free_item directly through the log intent code xfs: fix confusing xfs_extent_item variable names xfs: pass the xfs_bmbt_irec directly through the log intent code xfs: pass per-ag references to xfs_free_extent xfs: validate block number being freed before adding to xefi xfs: fix bounds check in xfs_defer_agfl_block() xfs: use deferred frees for btree block freeing xfs: reserve less log space when recovering log intent items xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h xfs: convert rt bitmap extent lengths to xfs_rtbxlen_t xfs: consider minlen sized extents in xfs_rtallocate_extent_block xfs: don't leak recovered attri intent items xfs: make rextslog computation consistent with mkfs xfs: fix 32-bit truncation in xfs_compute_rextslog xfs: don't allow overly small or large realtime volumes xfs: remove unused fields from struct xbtree_ifakeroot xfs: recompute growfsrtfree transaction reservation while growing rt volume xfs: force all buffers to be written during btree bulk load xfs: initialise di_crc in xfs_log_dinode xfs: add lock protection when remove perag from radix tree xfs: fix perag leak when growfs fails xfs: ensure logflagsp is initialized in xfs_bmap_del_extent_real xfs: update dir3 leaf block metadata after swap xfs: reset XFS_ATTR_INCOMPLETE filter on node removal xfs: remove conditional building of rt geometry validator functions Input: i8042 - swap old quirk combination with new quirk for NHxxRZQ Input: i8042 - add required quirks for missing old boardnames Input: i8042 - swap old quirk combination with new quirk for several devices Input: i8042 - swap old quirk combination with new quirk for more devices USB: serial: ftdi_sio: add support for Altera USB Blaster 3 USB: serial: option: add Telit Cinterion FE990B compositions USB: serial: option: fix Telit Cinterion FE990A name USB: serial: option: match on interface class for Telit FN990B x86/microcode/AMD: Fix out-of-bounds on systems with CPU-less NUMA nodes drm/atomic: Filter out redundant DPMS calls drm/dp_mst: Fix locking when skipping CSN before topology probing drm/amd/display: Restore correct backlight brightness after a GPU reset drm/amd/display: Assign normalized_pix_clk when color depth = 14 drm/amd/display: Fix slab-use-after-free on hdcp_work clk: samsung: update PLL locktime for PLL142XX used on FSD platform ASoC: amd: yc: Support mic on another Lenovo ThinkPad E16 Gen 2 model qlcnic: fix memory leak issues in qlcnic_sriov_common.c rust: Disallow BTF generation with Rust + LTO lib/buildid: Handle memfd_secret() files in build_id_parse() tcp: fix races in tcp_abort() tcp: fix forever orphan socket caused by tcp_abort leds: mlxreg: Use devm_mutex_init() for mutex initialization ASoC: ops: Consistently treat platform_max as control value drm/gma500: Add NULL check for pci_gfx_root in mid_get_vbt_data() ASoC: codecs: wm0010: Fix error handling path in wm0010_spi_probe() scripts: generate_rust_analyzer: Handle sub-modules with no Makefile scripts: `make rust-analyzer` for out-of-tree modules scripts: generate_rust_analyzer: provide `cfg`s for `core` and `alloc` scripts: generate_rust_analyzer: add missing macros deps cifs: Fix integer overflow while processing acregmax mount option cifs: Fix integer overflow while processing acdirmax mount option cifs: Fix integer overflow while processing actimeo mount option cifs: Fix integer overflow while processing closetimeo mount option i2c: ali1535: Fix an error handling path in ali1535_probe() i2c: ali15x3: Fix an error handling path in ali15x3_probe() i2c: sis630: Fix an error handling path in sis630_probe() arm64: mm: Populate vmemmap at the page level if not section aligned smb3: add support for IAKerb smb: client: Fix match_session bug preventing session reuse HID: apple: disable Fn key handling on the Omoton KB066 nvme-tcp: Fix a C2HTermReq error message smb: client: fix potential UAF in cifs_dump_full_key() firmware: imx-scu: fix OF node leak in .probe() arm64: dts: freescale: tqma8mpql: Fix vqmmc-supply xfrm_output: Force software GSO only in tunnel mode soc: imx8m: Remove global soc_uid soc: imx8m: Use devm_* to simplify probe failure handling soc: imx8m: Unregister cpufreq and soc dev in cleanup path ARM: dts: bcm2711: PL011 UARTs are actually r1p5 RDMA/bnxt_re: Add missing paranthesis in map_qp_id_to_tbl_indx ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP ARM: dts: bcm2711: Don't mark timer regs unconfigured RDMA/bnxt_re: Avoid clearing VLAN_ID mask in modify qp path RDMA/hns: Fix soft lockup during bt pages loop RDMA/hns: Fix unmatched condition in error path of alloc_user_qp_db() RDMA/hns: Fix a missing rollback in error path of hns_roce_create_qp_common() RDMA/hns: Fix wrong value of max_sge_rd Bluetooth: Fix error code in chan_alloc_skb_cb() ipv6: Fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw(). ipv6: Set errno after ip_fib_metrics_init() in ip6_route_info_create(). net: atm: fix use after free in lec_send() net: lwtunnel: fix recursion loops net/neighbor: add missing policy for NDTPA_QUEUE_LENBYTES Revert "gre: Fix IPv6 link-local address generation." i2c: omap: fix IRQ storms can: rcar_canfd: Fix page entries in the AFL list can: flexcan: only change CAN state when link up in system PM can: flexcan: disable transceiver during system PM drm/v3d: Don't run jobs that have errors flagged in its fence regulator: check that dummy regulator has been probed before using it arm64: dts: freescale: imx8mm-verdin-dahlia: add Microphone Jack to sound card mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops mmc: atmel-mci: Add missing clk_disable_unprepare() proc: fix UAF in proc_get_inode() ARM: shmobile: smp: Enforce shmobile_smp_* alignment efi/libstub: Avoid physical address 0x0 when doing random allocation xsk: fix an integer overflow in xp_create_and_assign_umem() batman-adv: Ignore own maximum aggregation size during RX soc: qcom: pdr: Fix the potential deadlock drm/radeon: fix uninitialized size issue in radeon_vce_cs_parse() drm/amdgpu: Fix JPEG video caps max size for navi1x and raven ksmbd: fix incorrect validation for num_aces field of smb_acl drm/amd/display: Use HW lock mgr for PSR1 when only one eDP mptcp: Fix data stream corruption in the address announcement netfilter: nft_counter: Use u64_stats_t for statistic. drm/mediatek: Fix coverity issue with unintentional integer overflow media: mediatek: vcodec: Fix VP8 stateless decoder smatch warning arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S drm/amdgpu: fix use-after-free bug fs/ntfs3: Change new sparse cluster processing wifi: iwlwifi: mvm: ensure offloading TID queue exists mm/migrate: fix shmem xarray update during migration block, bfq: fix re-introduced UAF in bic_set_bfqq() xfs: give xfs_extfree_intent its own perag reference Linux 6.1.132 Change-Id: If8f5c0975337904552609e4542f88d5516d3d64d Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-04-16 13:02:29 +00:00
Tao Huang	d491b8d870	Merge commit '1c80d2ad198679ca0289d5f37136b879d8426a7d' ... * commit '1c80d2ad198679ca0289d5f37136b879d8426a7d': (23 commits) arm64: dts: rockchip: rv1126bp-evb: Add spi nand config in rv1126bp-evb-v14.dts arm64: dts: rockchip: rk3576-vehicle-evb: Fix the flashing screen issue arm64: dts: rockchip: rk3576-vehicle-evb-v20.dts: Fix the flashing screen issue ARM: configs: Enable CONFIG_DRM_IGNORE_IOTCL_PERMIT for rv1126b-display.config media: rockchip: isp: fix isp32 lite stats error media: rockchip: fec: set the header offset for FBCE output media: rockchip: fec: add frame timeout info to procfs media: i2c: ov16880: add read otp support net: can: rockchip: rk3576: Fix dma function PCI: rockchip: dw: Optimize power down process arm64: dts: rockchip: rk3588: move rkcif_mipi_lvds4/rkcif_mipi_lvds5 to rk3588s.dtsi drm/rockchip: vop2: disable/enable cluster sub wins when entering/exiting PSR mode scripts: Add support for dts xlate from rv1126 to rv1126b drm/rockchip: vop2: add support mcu panel psr mode media: rockchip: aiisp: add procfs media: rockchip: vpss: support FBC format for rockit drm/rockchip: vop2: Leave vblank enabled after entering the PSR mode drm/rockchip: vop: Leave vblank enabled after entering the PSR mode arm64: dts: rockchip: rk3588: Add LCD module NE160QAM-NX1 eDP display board arm64: dts: rockchip: rk3576: Add LCD module NE160QAM-NX1 eDP display board ... Change-Id: Ic98384b2581d9e9f84460ee6ea8f348019490f62	2025-04-15 20:29:43 +08:00
Sugar Zhang	b831f32988	scripts: Add support for dts xlate from rv1126 to rv1126b ... Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> Change-Id: I428eb77eef58cdcd035a633ffb5a2d4b813c09c3	2025-04-14 19:27:04 +08:00
Tim Schumacher	89f6691cae	selinux: Chain up tool resolving errors in install_policy.sh ... [ Upstream commit 6ae0042f4d3f331e841495eb0a3d51598e593ec2 ] Subshell evaluations are not exempt from errexit, so if a command is not available, `which` will fail and exit the script as a whole. This causes the helpful error messages to not be printed if they are tacked on using a `$?` comparison. Resolve the issue by using chains of logical operators, which are not subject to the effects of errexit. Fixes: e37c1877ba ("scripts/selinux: modernize mdp") Signed-off-by: Tim Schumacher <tim.schumacher1@huawei.com> Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-04-10 14:33:30 +02:00
Tamir Duberstein	78cc9c3304	scripts: generate_rust_analyzer: add missing macros deps ... [ Upstream commit 2e0f91aba507a3cb59f7a12fc3ea2b7d4d6675b7 ] The macros crate has depended on std and proc_macro since its introduction in commit 1fbde52bde ("rust: add `macros` crate"). These dependencies were omitted from commit 8c4555ccc5 ("scripts: add `generate_rust_analyzer.py`") resulting in missing go-to-definition and autocomplete, and false-positive warnings emitted from rust-analyzer such as: [{ "resource": "/Users/tamird/src/linux/rust/macros/module.rs", "owner": "_generated_diagnostic_collection_name_#1", "code": { "value": "non_snake_case", "target": { "$mid": 1, "path": "/rustc/", "scheme": "https", "authority": "doc.rust-lang.org", "query": "search=non_snake_case" } }, "severity": 4, "message": "Variable `None` should have snake_case name, e.g. `none`", "source": "rust-analyzer", "startLineNumber": 123, "startColumn": 17, "endLineNumber": 123, "endColumn": 21 }] Add the missing dependencies to improve the developer experience. [ Fiona had a different approach (thanks!) at: https://lore.kernel.org/rust-for-linux/20241205115438.234221-1-me@kloenk.dev/ But Tamir and Fiona agreed to this one. - Miguel ] Fixes: 8c4555ccc5 ("scripts: add `generate_rust_analyzer.py`") Reviewed-by: Fiona Behrens <me@kloenk.dev> Diagnosed-by: Chayim Refael Friedman <chayimfr@gmail.com> Link: https://github.com/rust-lang/rust-analyzer/issues/17759#issuecomment-2646328275 Signed-off-by: Tamir Duberstein <tamird@gmail.com> Tested-by: Andreas Hindborg <a.hindborg@kernel.org> Link: https://lore.kernel.org/r/20250210-rust-analyzer-macros-core-dep-v3-1-45eb4836f218@gmail.com [ Removed `return`. Changed tag name. Added Link. Slightly reworded. - Miguel ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-03-28 21:58:58 +01:00
Martin Rodriguez Reboredo	d7cfc1a42f	scripts: generate_rust_analyzer: provide cfgs for core and alloc ... [ Upstream commit 4f353e0d12 ] Both `core` and `alloc` have their `cfgs` (such as `no_rc`) missing in `rust-project.json`. To remedy this, pass the flags to `generate_rust_analyzer.py` for them to be added to a dictionary where each key corresponds to a crate and each value to a list of `cfg`s. The dictionary is then used to pass the `cfg`s to each crate in the generated file (for `core` and `alloc` only). Signed-off-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com> Link: https://lore.kernel.org/r/20230804171448.54976-1-yakoyoku@gmail.com [ Removed `Suggested-by` as discussed in mailing list. ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Stable-dep-of: 2e0f91aba507 ("scripts: generate_rust_analyzer: add missing macros deps") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-03-28 21:58:57 +01:00
Vinay Varma	88a96a6fb1	scripts: make rust-analyzer for out-of-tree modules ... [ Upstream commit 49a9ef7674 ] Adds support for out-of-tree rust modules to use the `rust-analyzer` make target to generate the rust-project.json file. The change involves adding an optional parameter `external_src` to the `generate_rust_analyzer.py` which expects the path to the out-of-tree module's source directory. When this parameter is passed, I have chosen not to add the non-core modules (samples and drivers) into the result since these are not expected to be used in third party modules. Related changes are also made to the Makefile and rust/Makefile allowing the `rust-analyzer` target to be used for out-of-tree modules as well. Link: https://github.com/Rust-for-Linux/linux/pull/914 Link: https://github.com/Rust-for-Linux/rust-out-of-tree-module/pull/2 Signed-off-by: Vinay Varma <varmavinaym@gmail.com> Link: https://lore.kernel.org/r/20230411091714.130525-1-varmavinaym@gmail.com Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Stable-dep-of: 2e0f91aba507 ("scripts: generate_rust_analyzer: add missing macros deps") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-03-28 21:58:57 +01:00
Asahi Lina	d266fc89bc	scripts: generate_rust_analyzer: Handle sub-modules with no Makefile ... [ Upstream commit 5c7548d5a2 ] More complex drivers might want to use modules to organize their Rust code, but those module folders do not need a Makefile. generate_rust_analyzer.py currently crashes on those. Fix it so that a missing Makefile is silently ignored. Link: https://github.com/Rust-for-Linux/linux/pull/883 Signed-off-by: Asahi Lina <lina@asahilina.net> Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Stable-dep-of: 2e0f91aba507 ("scripts: generate_rust_analyzer: add missing macros deps") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-03-28 21:58:57 +01:00
Greg Kroah-Hartman	ed4c442cd6	Merge c56ba3ea8e ("misc: fastrpc: Fix copy buffer page size") into android14-6.1-lts ... Steps on the way to 6.1.129 Resolves merge conflicts with: drivers/i3c/master.c Change-Id: Ic60a64372e5acbd938424301c505f7520ca81003 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-03-11 09:31:23 -07:00
Tao Huang	e050359819	Merge commit '653a2c76e269628867632c7ce98fe2d75f3b13bb' ... * commit '653a2c76e269628867632c7ce98fe2d75f3b13bb': HID: usbhid: Ignore set Led for USB Reader drm/rockchip: vop2: config h-timing 2-pixel align for RK3576 DP scripts: mkmultidtb.py: fix print() syntax error on python3 ARM: dts: rockchip: rk3502: Don't Change CLK_32K_FRAC_MUX parent clock ARM: dts: rockchip: rv1126: modify compatible for dsi dphy phy/rockchip: inno-dsidphy: modify compatible for rv1126 dsi dphy drm/rockchip: vkms: fix the size check of built-in modes in &drm_connector_helper_funcs.get_modes() arm64: dts: rockchip: rk3576-rk806/tablet: Revised battery charging current configuration Change-Id: I0c11b61db6f97dbcf5a600d10f5cb240a1ef62e4	2025-03-11 20:08:22 +08:00
Elon Zhang	a1a5c2f858	scripts: mkmultidtb.py: fix print() syntax error on python3 ... Signed-off-by: Elon Zhang <zhangzj@rock-chips.com> Change-Id: I7f78cf8d9f46b0732a13874e13b9cbae7258cb3e	2025-03-11 11:59:42 +00:00
Greg Kroah-Hartman	9fb90380c1	Merge e10b392a74 ("net: usb: rtl8150: enable basic endpoint checking") into android14-6.1-lts ... Steps on the way to 6.1.129 Resolves merge conflicts in: scripts/Makefile.lib Change-Id: Id496f510e74b8576bd71449bf8ffa338072eb8e4 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-03-07 08:11:45 +00:00
Nathan Chancellor	e24fc5b7bc	kbuild: Move -Wenum-enum-conversion to W=2 ... commit 8f6629c004b193d23612641c3607e785819e97ab upstream. -Wenum-enum-conversion was strengthened in clang-19 to warn for C, which caused the kernel to move it to W=1 in commit 75b5ab134bb5 ("kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1") because there were numerous instances that would break builds with -Werror. Unfortunately, this is not a full solution, as more and more developers, subsystems, and distributors are building with W=1 as well, so they continue to see the numerous instances of this warning. Since the move to W=1, there have not been many new instances that have appeared through various build reports and the ones that have appeared seem to be following similar existing patterns, suggesting that most instances of this warning will not be real issues. The only alternatives for silencing this warning are adding casts (which is generally seen as an ugly practice) or refactoring the enums to macro defines or a unified enum (which may be undesirable because of type safety in other parts of the code). Move the warning to W=2, where warnings that occur frequently but may be relevant should reside. Cc: stable@vger.kernel.org Fixes: 75b5ab134bb5 ("kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1") Link: https://lore.kernel.org/ZwRA9SOcOjjLJcpi@google.com/ Signed-off-by: Nathan Chancellor <nathan@kernel.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2025-02-21 13:49:46 +01:00
Parth Pancholi	256a57b2f7	kbuild: switch from lz4c to lz4 for compression ... commit e397a603e49cc7c7c113fad9f55a09637f290c34 upstream. Replace lz4c with lz4 for kernel image compression. Although lz4 and lz4c are functionally similar, lz4c has been deprecated upstream since 2018. Since as early as Ubuntu 16.04 and Fedora 25, lz4 and lz4c have been packaged together, making it safe to update the requirement from lz4c to lz4. Consequently, some distributions and build systems, such as OpenEmbedded, have fully transitioned to using lz4. OpenEmbedded core adopted this change in commit fe167e082cbd ("bitbake.conf: require lz4 instead of lz4c"), causing compatibility issues when building the mainline kernel in the latest OpenEmbedded environment, as seen in the errors below. This change also updates the LZ4 compression commands to make it backward compatible by replacing stdin and stdout with the '-' option, due to some unclear reason, the stdout keyword does not work for lz4 and '-' works for both. In addition, this modifies the legacy '-c1' with '-9' which is also compatible with both. This fixes the mainline kernel build failures with the latest master OpenEmbedded builds associated with the mentioned compatibility issues. LZ4 arch/arm/boot/compressed/piggy_data /bin/sh: 1: lz4c: not found ... ... ERROR: oe_runmake failed Link: https://github.com/lz4/lz4/pull/553 Suggested-by: Francesco Dolcini <francesco.dolcini@toradex.com> Signed-off-by: Parth Pancholi <parth.pancholi@toradex.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Cc: Salvatore Bonaccorso <carnil@debian.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2025-02-21 13:49:25 +01:00
Masahiro Yamada	bdaa726c15	kconfig: fix memory leak in sym_warn_unmet_dep() ... [ Upstream commit a409fc1463d664002ea9bf700ae4674df03de111 ] The string allocated in sym_warn_unmet_dep() is never freed, leading to a memory leak when an unmet dependency is detected. Fixes: f8f69dc0b4 ("kconfig: make unmet dependency warnings readable") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Petr Vorel <pvorel@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Sergey Senozhatsky	261bafc8bf	kconfig: WERROR unmet symbol dependency ... [ Upstream commit 15d3f7664d2776c086f813f1efbfe2ae20a85e89 ] When KCONFIG_WERROR env variable is set treat unmet direct symbol dependency as a terminal condition (error). Suggested-by: Stefan Reinauer <reinauer@google.com> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Masahiro Yamada	ccc65c06b1	kconfig: deduplicate code in conf_read_simple() ... [ Upstream commit d854b4b21de684a16a7d6163c7b0e9c5ff8a09d3 ] Kconfig accepts both "# CONFIG_FOO is not set" and "CONFIG_FOO=n" as a valid input, but conf_read_simple() duplicates similar code to handle them. Factor out the common code. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Masahiro Yamada	d2a7e49ae2	kconfig: remove unused code for S_DEF_AUTO in conf_read_simple() ... [ Upstream commit 92d4fe0a48f1ab6cf20143dd0b376f4fe842854b ] The 'else' arm here is unreachable in practical use cases. include/config/auto.conf does not include "# CONFIG_... is not set" line unless it is manually hacked. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Masahiro Yamada	fc4f353d8f	kconfig: require a space after '#' for valid input ... [ Upstream commit 4d137ab0107ead0f2590fc0314e627431e3b9e3f ] Currently, when an input line starts with '#', (line + 2) is passed to memcmp() without checking line[1]. It means that line[1] can be any arbitrary character. For example, "#KCONFIG_FOO is not set" is accepted as valid input, functioning the same as "# CONFIG_FOO is not set". More importantly, this can potentially lead to a buffer overrun if line[1] == '\0'. It occurs if the input only contains '#', as (line + 2) points to an uninitialized buffer. Check line[1], and skip the line if it is not a space. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Sergey Senozhatsky	328e41aae2	kconfig: add warn-unknown-symbols sanity check ... [ Upstream commit 7cd343008b ] Introduce KCONFIG_WARN_UNKNOWN_SYMBOLS environment variable, which makes Kconfig warn about unknown config symbols. This is especially useful for continuous kernel uprevs when some symbols can be either removed or renamed between kernel releases (which can go unnoticed otherwise). By default KCONFIG_WARN_UNKNOWN_SYMBOLS generates warnings, which are non-terminal. There is an additional environment variable KCONFIG_WERROR that overrides this behaviour and turns warnings into errors. Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Stable-dep-of: a409fc1463d6 ("kconfig: fix memory leak in sym_warn_unmet_dep()") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Masahiro Yamada	5aa5075b61	kconfig: fix file name in warnings when loading KCONFIG_DEFCONFIG_LIST ... [ Upstream commit a314f52a0210730d0d556de76bb7388e76d4597d ] Most 'make *config' commands use .config as the base configuration file. When .config does not exist, Kconfig tries to load a file listed in KCONFIG_DEFCONFIG_LIST instead. However, since commit b75b0a819a ("kconfig: change defconfig_list option to environment variable"), warning messages have displayed an incorrect file name in such cases. Below is a demonstration using Debian Trixie. While loading /boot/config-6.12.9-amd64, the warning messages incorrectly show .config as the file name. With this commit, the correct file name is displayed in warnings. [Before] $ rm -f .config $ make config # # using defaults found in /boot/config-6.12.9-amd64 # .config:6804:warning: symbol value 'm' invalid for FB_BACKLIGHT .config:9895:warning: symbol value 'm' invalid for ANDROID_BINDER_IPC [After] $ rm -f .config $ make config # # using defaults found in /boot/config-6.12.9-amd64 # /boot/config-6.12.9-amd64:6804:warning: symbol value 'm' invalid for FB_BACKLIGHT /boot/config-6.12.9-amd64:9895:warning: symbol value 'm' invalid for ANDROID_BINDER_IPC Fixes: b75b0a819a ("kconfig: change defconfig_list option to environment variable") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:24 +01:00
Masahiro Yamada	ff83cd07bf	genksyms: fix memory leak when the same symbol is read from *.symref file ... [ Upstream commit be2fa44b5180a1f021efb40c55fdf63c249c3209 ] When a symbol that is already registered is read again from *.symref file, __add_symbol() removes the previous one from the hash table without freeing it. [Test Case] $ cat foo.c #include <linux/export.h> void foo(void); void foo(void) {} EXPORT_SYMBOL(foo); $ cat foo.symref foo void foo ( void ) foo void foo ( void ) When a symbol is removed from the hash table, it must be freed along with its ->name and ->defn members. However, sym->name cannot be freed because it is sometimes shared with node->string, but not always. If sym->name and node->string share the same memory, free(sym->name) could lead to a double-free bug. To resolve this issue, always assign a strdup'ed string to sym->name. Fixes: 64e6c1e123 ("genksyms: track symbol checksum changes") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:23 +01:00
Masahiro Yamada	ce63da1e60	genksyms: fix memory leak when the same symbol is added from source ... [ Upstream commit 45c9c4101d3d2fdfa00852274bbebba65fcc3cf2 ] When a symbol that is already registered is added again, __add_symbol() returns without freeing the symbol definition, making it unreachable. The following test cases demonstrate different memory leak points. [Test Case 1] Forward declaration with exactly the same definition $ cat foo.c #include <linux/export.h> void foo(void); void foo(void) {} EXPORT_SYMBOL(foo); [Test Case 2] Forward declaration with a different definition (e.g. attribute) $ cat foo.c #include <linux/export.h> void foo(void); __attribute__((__section__(".ref.text"))) void foo(void) {} EXPORT_SYMBOL(foo); [Test Case 3] Preserving an overridden symbol (compile with KBUILD_PRESERVE=1) $ cat foo.c #include <linux/export.h> void foo(void); void foo(void) { } EXPORT_SYMBOL(foo); $ cat foo.symref override foo void foo ( int ) The memory leaks in Test Case 1 and 2 have existed since the introduction of genksyms into the kernel tree. [1] The memory leak in Test Case 3 was introduced by commit 5dae9a550a ("genksyms: allow to ignore symbol checksum changes"). When multiple init_declarators are reduced to an init_declarator_list, the decl_spec must be duplicated. Otherwise, the following Test Case 4 would result in a double-free bug. [Test Case 4] $ cat foo.c #include <linux/export.h> extern int foo, bar; int foo, bar; EXPORT_SYMBOL(foo); In this case, 'foo' and 'bar' share the same decl_spec, 'int'. It must be unshared before being passed to add_symbol(). [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=46bd1da672d66ccd8a639d3c1f8a166048cca608 Fixes: 5dae9a550a ("genksyms: allow to ignore symbol checksum changes") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-02-21 13:49:23 +01:00
Tao Huang	6b33334fb6	Merge commit 'c1862eb07d904923cfbff4b91f51005e3195c4f4' ... * commit 'c1862eb07d904923cfbff4b91f51005e3195c4f4': (35 commits) drm: rockchip: rk618: update hdmi connect status to jack drm: rockchip: rk618: add spdif for hdmi audio source misc: rk628: dsi: fix timing configuration not working phy: rockchip: phy-rockchip-usbdp: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-usb: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-typec: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-samsung-hdptx: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-pcie: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-inno-hdmi: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-inno-dsidphy: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-inno-csidphy: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-emmc: Fix typo in Rockchip copyright notice phy: rockchip: phy-rockchip-dp: Fix typo in Rockchip copyright notice PCI: rockchip: Fix typos in Rockchip copyright notices nvmem: rockchip-otp: Fix typo in Rockchip copyright notice nvmem: rockchip-efuse: Fix typo in Rockchip copyright notice nvmem: rockchip-secure-otp: Fix typos in Rockchip copyright notices ASoC: rockchip: rk3399_gru_sound: Fix typo in Rockchip copyright notice ASoC: rockchip: i2s: Fix typos in Rockchip copyright notices ASoC: rockchip: i2s-tdm: Fix typos in Rockchip copyright notices ... Change-Id: I379a3458f5672fbe4bbe20c6fa8a2de5cd103787	2025-01-21 20:04:01 +08:00
Tao Huang	819625f764	rk: mkkrnlimg: Fix typo in Rockchip copyright notice ... Signed-off-by: Tao Huang <huangtao@rock-chips.com> Change-Id: I26f965746bf16f8c429a39cdaa94f4e1df7be5db	2025-01-21 11:05:10 +08:00
Greg Kroah-Hartman	c0e2451628	Merge c0dde4a52b ("dm-ebs: don't set the flag DM_TARGET_PASSES_INTEGRITY") into android14-6.1-lts ... Steps on the way to 6.1.125 Resolves merge conflicts in: net/core/sock_map.c Change-Id: Ie56905f271c73906e8176b2aaa69e368145b1bb9 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-01-17 15:46:15 +00:00
Kuan-Wei Chiu	939d239fe8	scripts/sorttable: fix orc_sort_cmp() to maintain symmetry and transitivity ... The orc_sort_cmp() function, used with qsort(), previously violated the symmetry and transitivity rules required by the C standard. Specifically, when both entries are ORC_REG_UNDEFINED, it could result in both a < b and b < a, which breaks the required symmetry and transitivity. This can lead to undefined behavior and incorrect sorting results, potentially causing memory corruption in glibc implementations [1]. Symmetry: If x < y, then y > x. Transitivity: If x < y and y < z, then x < z. Fix the comparison logic to return 0 when both entries are ORC_REG_UNDEFINED, ensuring compliance with qsort() requirements. Link: https://www.qualys.com/2024/01/30/qsort.txt [1] Link: https://lkml.kernel.org/r/20241226140332.2670689-1-visitorckw@gmail.com Fixes: 57fa189942 ("scripts/sorttable: Implement build-time ORC unwind table sorting") Fixes: fb799447ae ("x86,objtool: Split UNWIND_HINT_EMPTY in two") Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> Cc: Ching-Chun (Jim) Huang <jserv@ccns.ncku.edu.tw> Cc: <chuang@cs.nycu.edu.tw> Cc: Ingo Molnar <mingo@kernel.org> Cc: Josh Poimboeuf <jpoimboe@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Shile Zhang <shile.zhang@linux.alibaba.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit 0210d251162f4033350a94a43f95b1c39ec84a90) Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-01-17 13:34:38 +01:00
Tao Huang	bcac4856be	Merge commit 'a887a44ace2a27d86308356a7ea0db00d79f2c44' of https://android.googlesource.com/kernel/common ... * commit 'a887a44ace2a27d86308356a7ea0db00d79f2c44': (3057 commits) ANDROID: KVM: arm64: Always check state from host_ack_unshare() FROMLIST: KVM: arm64: Always check the state from hyp_ack_unshare() UPSTREAM: f2fs: fix fiemap failure issue when page size is 16KB ANDROID: GKI: Update symbol list for mtk UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT UPSTREAM: net: sched: use RCU read-side critical section in taprio_dump() UPSTREAM: f2fs: compress: don't redirty sparse cluster during {,de}compress UPSTREAM: f2fs: compress: don't {,de}compress non-full cluster UPSTREAM: f2fs: allow f2fs_ioc_{,de}compress_file to be interrupted UPSTREAM: f2fs: compress: do sanity check on cluster when CONFIG_F2FS_CHECK_FS is on UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files ANDROID: add file for recording allowed ABI breaks ANDROID: GKI: update symbol list for honor ANDROID: vendor_hooks: add hook to record reboot reason BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze FROMGIT: binder: allow freeze notification for dead nodes FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs ANDROID: GKI: Update symbol list for BCMSTB ANDROID: psi: Add vendor hooks for PSI tracing ... Change-Id: I5b8cfb8bec82380db9cdd9fbe3b39708a8f92f98 Conflicts: arch/arm64/boot/dts/rockchip/rk356x.dtsi drivers/gpio/gpio-rockchip.c drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c drivers/gpu/drm/rockchip/rockchip_drm_vop.c drivers/gpu/drm/rockchip/rockchip_drm_vop.h drivers/gpu/drm/rockchip/rockchip_drm_vop2.c drivers/gpu/drm/rockchip/rockchip_vop_reg.c drivers/media/i2c/imx335.c drivers/pci/controller/dwc/pcie-dw-rockchip.c drivers/spi/spi-rockchip.c drivers/spi/spidev.c drivers/usb/dwc3/core.c drivers/usb/dwc3/gadget.c drivers/usb/typec/tcpm/tcpm.c	2025-01-10 18:00:20 +08:00
Tao Huang	96900fe2fe	Merge tag 'v6.1.115' ... This is the 6.1.115 stable release * tag 'v6.1.115': (2780 commits) Linux 6.1.115 xfrm: validate new SA's prefixlen using SA family when sel.family is unset arm64/uprobes: change the uprobe_opcode_t typedef to fix the sparse warning ACPI: PRM: Clean up guid type in struct prm_handler_info platform/x86: dell-wmi: Ignore suspend notifications ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe() net: phy: dp83822: Fix reset pin definitions serial: protect uart_port_dtr_rts() in uart_shutdown() too selinux: improve error checking in sel_write_load() drm/amd/display: Disable PSR-SU on Parade 08-01 TCON too hv_netvsc: Fix VF namespace also in synthetic NIC NETDEV_REGISTER event xfrm: fix one more kernel-infoleak in algo dumping LoongArch: Get correct cores_per_package for SMT systems ALSA: hda/realtek: Add subwoofer quirk for Acer Predator G9-593 KVM: arm64: Don't eagerly teardown the vgic on init error KVM: nSVM: Ignore nCR3[4:0] when loading PDPTEs from memory openat2: explicitly return -E2BIG for (usize > PAGE_SIZE) nilfs2: fix kernel bug due to missing clearing of buffer delay flag ACPI: button: Add DMI quirk for Samsung Galaxy Book2 to fix initial lid detection issue ACPI: PRM: Find EFI_MEMORY_RUNTIME block for PRM handler and context ... Change-Id: Iee600c49a5c914b79141c62cda38e787e429a167 Conflicts: arch/arm64/boot/dts/rockchip/rk356x.dtsi drivers/gpio/gpio-rockchip.c drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c drivers/gpu/drm/rockchip/rockchip_drm_vop.c drivers/gpu/drm/rockchip/rockchip_drm_vop.h drivers/gpu/drm/rockchip/rockchip_drm_vop2.c drivers/gpu/drm/rockchip/rockchip_vop_reg.c drivers/media/i2c/imx335.c drivers/pci/controller/dwc/pcie-dw-rockchip.c drivers/spi/spi-rockchip.c drivers/spi/spidev.c drivers/usb/dwc3/gadget.c drivers/usb/host/xhci.h	2025-01-10 17:48:57 +08:00
Greg Kroah-Hartman	4ff68760c1	Merge 6.1.124 into android14-6.1-lts ... Changes in 6.1.124 x86/hyperv: Fix hv tsc page based sched_clock for hibernation selinux: ignore unknown extended permissions btrfs: fix use-after-free in btrfs_encoded_read_endio() tracing: Have process_string() also allow arrays thunderbolt: Add support for Intel Lunar Lake thunderbolt: Add support for Intel Panther Lake-M/P thunderbolt: Don't display nvm_version unless upgrade supported xhci: retry Stop Endpoint on buggy NEC controllers usb: xhci: Limit Stop Endpoint retries xhci: Turn NEC specific quirk for handling Stop Endpoint errors generic net: mctp: handle skb cleanup on sock_queue failures RDMA/mlx5: Enforce same type port association for multiport RoCE RDMA/bnxt_re: Add check for path mtu in modify_qp RDMA/bnxt_re: Fix reporting hw_ver in query_device RDMA/bnxt_re: Fix max_qp_wrs reported RDMA/bnxt_re: Fix the locking while accessing the QP table drm/bridge: adv7511_audio: Update Audio InfoFrame properly net: dsa: microchip: Fix KSZ9477 set_ageing_time function net: dsa: microchip: add ksz_rmw8() function net: dsa: microchip: Fix LAN937X set_ageing_time function RDMA/hns: Refactor mtr find RDMA/hns: Remove unused parameters and variables RDMA/hns: Fix mapping error of zero-hop WQE buffer RDMA/hns: Fix warning storm caused by invalid input in IO path RDMA/hns: Fix missing flush CQE for DWQE net: stmmac: platform: provide devm_stmmac_probe_config_dt() net: stmmac: don't create a MDIO bus if unnecessary net: stmmac: restructure the error path of stmmac_probe_config_dt() net: fix memory leak in tcp_conn_request() ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices ip_tunnel: annotate data-races around t->parms.link ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev() ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit() ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit() net: Fix netns for ip_tunnel_init_flow() netrom: check buffer length before accessing it drm/i915/dg1: Fix power gate sequence. netfilter: nft_set_hash: unaligned atomic read on struct nft_set_ext net: llc: reset skb->transport_header ALSA: usb-audio: US16x08: Initialize array before use eth: bcmsysport: fix call balance of priv->clk handling routines net: mv643xx_eth: fix an OF node reference leak net: wwan: t7xx: Fix FSM command timeout issue RDMA/rtrs: Ensure 'ib_sge list' is accessible net: reenable NETIF_F_IPV6_CSUM offload for BIG TCP packets net: restrict SO_REUSEPORT to inet sockets net: wwan: iosm: Properly check for valid exec stage in ipc_mmio_init() af_packet: fix vlan_get_tci() vs MSG_PEEK af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK ila: serialize calls to nf_register_net_hooks() btrfs: rename and export __btrfs_cow_block() btrfs: fix use-after-free when COWing tree bock and tracing is enabled wifi: mac80211: wake the queues in case of failure in resume drm/amdkfd: Correct the migration DMA map direction btrfs: flush delalloc workers queue before stopping cleaner kthread during unmount ALSA: hda/realtek: Add new alc2xx-fixup-headset-mic model sound: usb: enable DSD output for ddHiFi TC44C sound: usb: format: don't warn that raw DSD is unsupported bpf: fix potential error return ksmbd: retry iterate_dir in smb2_query_dir net: usb: qmi_wwan: add Telit FE910C04 compositions Bluetooth: hci_core: Fix sleeping function called from invalid context irqchip/gic: Correct declaration of *percpu_base pointer in union gic_base ARC: build: Try to guess GCC variant of cross compiler usb: xhci: Avoid queuing redundant Stop Endpoint commands modpost: fix input MODULE_DEVICE_TABLE() built for 64-bit on 32-bit host modpost: fix the missed iteration for the max bit in do_input() ALSA hda/realtek: Add quirk for Framework F111:000C ALSA: seq: oss: Fix races at processing SysEx messages kcov: mark in_softirq_really() as __always_inline RDMA/uverbs: Prevent integer overflow issue pinctrl: mcp23s08: Fix sleeping in atomic context due to regmap locking sky2: Add device ID 11ab:4373 for Marvell 88E8075 net/sctp: Prevent autoclose integer overflow in sctp_association_init() drm: adv7511: Drop dsi single lane support dt-bindings: display: adi,adv7533: Drop single lane support mm/readahead: fix large folio support in async readahead mm: vmscan: account for free pages to prevent infinite Loop in throttle_direct_reclaim() mptcp: fix TCP options overflow. mptcp: fix recvbuffer adjust on sleeping rcvmsg mptcp: don't always assume copied data in mptcp_cleanup_rbuf() zram: check comp is non-NULL before calling comp_destroy Linux 6.1.124 Change-Id: I43da72a5fa6821c2f14540a42f7f3866982a95b5 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2025-01-10 09:30:42 +00:00
Masahiro Yamada	1f8da43e12	modpost: fix the missed iteration for the max bit in do_input() ... [ Upstream commit bf36b4bf1b9a7a0015610e2f038ee84ddb085de2 ] This loop should iterate over the range from 'min' to 'max' inclusively. The last interation is missed. Fixes: 1d8f430c15 ("[PATCH] Input: add modalias support") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-01-09 13:30:05 +01:00
Masahiro Yamada	7635c2d787	modpost: fix input MODULE_DEVICE_TABLE() built for 64-bit on 32-bit host ... [ Upstream commit 77dc55a978e69625f9718460012e5ef0172dc4de ] When building a 64-bit kernel on a 32-bit build host, incorrect input MODULE_ALIAS() entries may be generated. For example, when compiling a 64-bit kernel with CONFIG_INPUT_MOUSEDEV=m on a 64-bit build machine, you will get the correct output: $ grep MODULE_ALIAS drivers/input/mousedev.mod.c MODULE_ALIAS("input:b*v*p*e*-e*1,*2,*k*110,*r*0,*1,*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*2,*k*r*8,*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*3,*k*14A,*r*a*0,*1,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*3,*k*145,*r*a*0,*1,*18,*1C,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*3,*k*110,*r*a*0,*1,*m*l*s*f*w*"); However, building the same kernel on a 32-bit machine results in incorrect output: $ grep MODULE_ALIAS drivers/input/mousedev.mod.c MODULE_ALIAS("input:b*v*p*e*-e*1,*2,*k*110,*130,*r*0,*1,*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*2,*k*r*8,*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*3,*k*14A,*16A,*r*a*0,*1,*20,*21,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*3,*k*145,*165,*r*a*0,*1,*18,*1C,*20,*21,*38,*3C,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*3,*k*110,*130,*r*a*0,*1,*20,*21,*m*l*s*f*w*"); A similar issue occurs with CONFIG_INPUT_JOYDEV=m. On a 64-bit build machine, the output is: $ grep MODULE_ALIAS drivers/input/joydev.mod.c MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*0,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*2,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*8,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*6,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*k*120,*r*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*k*130,*r*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*k*2C0,*r*a*m*l*s*f*w*"); However, on a 32-bit machine, the output is incorrect: $ grep MODULE_ALIAS drivers/input/joydev.mod.c MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*0,*20,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*2,*22,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*8,*28,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*3,*k*r*a*6,*26,*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*k*11F,*13F,*r*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*k*11F,*13F,*r*a*m*l*s*f*w*"); MODULE_ALIAS("input:b*v*p*e*-e*1,*k*2C0,*2E0,*r*a*m*l*s*f*w*"); When building a 64-bit kernel, BITS_PER_LONG is defined as 64. However, on a 32-bit build machine, the constant 1L is a signed 32-bit value. Left-shifting it beyond 32 bits causes wraparound, and shifting by 31 or 63 bits makes it a negative value. The fix in commit e0e9263271 ("[PATCH] PATCH: 1 line 2.6.18 bugfix: modpost-64bit-fix.patch") is incorrect; it only addresses cases where a 64-bit kernel is built on a 64-bit build machine, overlooking cases on a 32-bit build machine. Using 1ULL ensures a 64-bit width on both 32-bit and 64-bit machines, avoiding the wraparound issue. Fixes: e0e9263271 ("[PATCH] PATCH: 1 line 2.6.18 bugfix: modpost-64bit-fix.patch") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Stable-dep-of: bf36b4bf1b9a ("modpost: fix the missed iteration for the max bit in do_input()") Signed-off-by: Sasha Levin <sashal@kernel.org>	2025-01-09 13:30:05 +01:00
Greg Kroah-Hartman	059dc61b44	Merge 8379d0cbd5 ("mmc: core: Add SD card quirk for broken poweroff notification") into android14-6.1-lts ... Steps on the way to 6.1.121 Resolved merge conflicts in: drivers/mmc/core/card.h include/linux/mmc/card.h Change-Id: I0f59989030d630651cfd6bc28c45db5f313db1fe Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2024-12-30 09:24:51 +00:00
Greg Kroah-Hartman	daaf475999	Merge 749a916a9c ("usb: dwc3: ep0: Don't clear ep0 DWC3_EP_TRANSFER_STARTED") into android14-6.1-lts ... Steps on the way to 6.1.121 Resolves merge conflicts in: fs/f2fs/file.c fs/f2fs/segment.c Change-Id: Ib221190cc792a39283e1aac50f5038484f2ef1a2 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>	2024-12-20 15:05:00 +00:00
Thomas Gleixner	c23abcb314	modpost: Add .irqentry.text to OTHER_SECTIONS ... commit 7912405643a14b527cd4a4f33c1d4392da900888 upstream. The compiler can fully inline the actual handler function of an interrupt entry into the .irqentry.text entry point. If such a function contains an access which has an exception table entry, modpost complains about a section mismatch: WARNING: vmlinux.o(__ex_table+0x447c): Section mismatch in reference ... The relocation at __ex_table+0x447c references section ".irqentry.text" which is not in the list of authorized sections. Add .irqentry.text to OTHER_SECTIONS to cure the issue. Reported-by: Sergey Senozhatsky <senozhatsky@chromium.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org # needed for linux-5.4-y Link: https://lore.kernel.org/all/20241128111844.GE10431@google.com/ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> [ bump the size of good_tosec[] to prevent overflow - gregkh ] Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2024-12-14 19:54:35 +01:00
Masahiro Yamada	c2f8665338	modpost: remove incorrect code in do_eisa_entry() ... [ Upstream commit 0c3e091319e4748cb36ac9a50848903dc6f54054 ] This function contains multiple bugs after the following commits:  - ac55182899 ("modpost: i2c aliases need no trailing wildcard")  - 6543becf26 ("mod/file2alias: make modalias generation safe for cross compiling") Commit ac55182899 inserted the following code to do_eisa_entry():     else             strcat(alias, "*"); This is incorrect because 'alias' is uninitialized. If it is not NULL-terminated, strcat() could cause a buffer overrun. Even if 'alias' happens to be zero-filled, it would output: MODULE_ALIAS("*"); This would match anything. As a result, the module could be loaded by any unrelated uevent from an unrelated subsystem. Commit ac55182899 introduced another bug.             Prior to that commit, the conditional check was:     if (eisa->sig[0]) This checked if the first character of eisa_device_id::sig was not '\0'. However, commit ac55182899 changed it as follows:     if (sig[0]) sig[0] is NOT the first character of the eisa_device_id::sig. The type of 'sig' is 'char (*)[8]', meaning that the type of 'sig[0]' is 'char [8]' instead of 'char'. 'sig[0]' and 'symval' refer to the same address, which never becomes NULL. The correct conversion would have been:     if ((*sig)[0]) However, this if-conditional was meaningless because the earlier change in commit ac551828993e was incorrect. This commit removes the entire incorrect code, which should never have been executed. Fixes: ac55182899 ("modpost: i2c aliases need no trailing wildcard") Fixes: 6543becf26 ("mod/file2alias: make modalias generation safe for cross compiling") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>	2024-12-14 19:54:09 +01:00
Tao Huang	9b40797a9c	Merge commit '861574fe128af3e02d6493614f5d1f968ace0708' ... * commit '861574fe128af3e02d6493614f5d1f968ace0708': Revert "rk: add scripts/clang-wrapper.py" Revert "rk: add gcc-wrapper" PCI: rockchip: dw-ep: Detecting ATU features to achieve DWC ATU interface development drm/rockchip: vop2: Check the write-back width for VOP version prior rk3588 UPSTREAM: drm/rockchip: vop: Fix a dereferenced before check warning ASoC: rockchip: i2s-tdm: Fix WL for TDM mode net: wireless: rockchip_wlan: bcmdhd: fixup compile error on aarch32 arm64: dts: rockchip: rk3328: fix usb2phy node name ARM: dts: rockchip: rk3506-iotest: change ubi.mtd from 4 to 5 misc: rockchip: pcie-rkep: Support pcie err_handler Change-Id: I2c6aa5c7d6eefefa54c22abbbb803c7f3df50564	2024-12-02 19:35:19 +08:00