shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2025-06-16 05:29:25 +00:00
committed by Treehugger Robot
parent f6c21bc9a6 18282059e0
commit 45271a2c46
509 changed files with 6464 additions and 2747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/config
View File

@@ -32,6 +32,7 @@ commands:
Disable option directly after other option
--module-after|-M beforeopt option
Turn option into module directly after other option
--refresh Refresh the config using old settings
commands can be repeated multiple times
@@ -124,16 +125,22 @@ undef_var() {
txt_delete "^# $name is not set" "$FN"
}
if [ "$1" = "--file" ]; then
FN="$2"
if [ "$FN" = "" ] ; then
usage
FN=.config
CMDS=()
while [[ $# -gt 0 ]]; do
if [ "$1" = "--file" ]; then
if [ "$2" = "" ]; then
usage
fi
FN="$2"
shift 2
else
CMDS+=("$1")
shift
fi
shift 2
else
FN=.config
fi
done
set -- "${CMDS[@]}"
if [ "$1" = "" ] ; then
usage
fi
@@ -217,9 +224,8 @@ while [ "$1" != "" ] ; do
set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A"
;;
# undocumented because it ignores --file (fixme)
--refresh)
yes "" | make oldconfig
yes "" | make oldconfig KCONFIG_CONFIG=$FN
;;
*)

4
scripts/kconfig/merge_config.sh
View File

@@ -105,8 +105,8 @@ INITFILE=$1
shift;
if [ ! -r "$INITFILE" ]; then
echo "The base file '$INITFILE' does not exist. Exit." >&2
exit 1
echo "The base file '$INITFILE' does not exist. Creating one..." >&2
touch "$INITFILE"
fi
MERGE_LIST=$*