Sync update #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

sunflower2333 merged 416 commits into sunflower2333:master from torvalds:master

Jan 26, 2026

.mailmap

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
     #
     Aaron Durbin <adurbin@google.com>
     Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
+    Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
     Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
     Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
     Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ Expand Down Expand Up / @@ -878,6 +879,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de> @@
     Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
     Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
     Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
+    Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
+    Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
     Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
     Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
     Yusuke Goda <goda.yusuke@renesas.com>
@@ Expand Down @@

CREDITS

-Original file line number
+Diff line change
@@ Expand Up / @@ -2231,6 +2231,10 @@ S: Markham, Ontario @@
     S: L3R 8B2
     S: Canada
+    N: Krzysztof Kozlowski
+    E: krzk@kernel.org
+    D: NFC network subsystem and drivers maintainer
     N: Christian Krafft
     D: PowerPC Cell support
@@ Expand Down @@

Documentation/admin-guide/laptops/alienware-wmi.rst

-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,7 @@ information. @@
     Manual fan control on the other hand, is not exposed directly by the AWCC
     interface. Instead it let's us control a fan `boost` value. This `boost` value
-    has the following aproximate behavior over the fan pwm:
+    has the following approximate behavior over the fan pwm:
     ::
@@ Expand Down @@

Documentation/arch/riscv/uabi.rst

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,9 @@ ISA string ordering in /proc/cpuinfo @@
     ------------------------------------
     The canonical order of ISA extension names in the ISA string is defined in
-    chapter 27 of the unprivileged specification.
+    Chapter 27 of the RISC-V Instruction Set Manual Volume I Unprivileged ISA
+    (Document Version 20191213).
     The specification uses vague wording, such as should, when it comes to ordering,
     so for our purposes the following rules apply:
@@ Expand Down @@

Documentation/arch/x86/amd_hsmp.rst

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,7 +14,7 @@ set of mailbox registers.
  
    More details on the interface can be found in chapter

    "7 Host System Management Port (HSMP)" of the family/model PPR

    Eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip

    Eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50

    HSMP interface is supported on EPYC line of server CPUs and MI300A (APU).

    @@ -185,7 +185,7 @@ what happened. The transaction returns 0 on success.
  
    More details on the interface and message definitions can be found in chapter

    "7 Host System Management Port (HSMP)" of the respective family/model PPR

    eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip

    eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50

    User space C-APIs are made available by linking against the esmi library,

    which is provided by the E-SMS project https://www.amd.com/en/developer/e-sms.html.

Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ maintainers: @@
       - Jitao shi <jitao.shi@mediatek.com>
     description: |
-      MediaTek DP and eDP are different hardwares and there are some features
+      MediaTek DP and eDP are different hardware and there are some features
       which are not supported for eDP. For example, audio is not supported for
       eDP. Therefore, we need to use two different compatibles to describe them.
       In addition, We just need to enable the power domain of DP, so the clock
@@ Expand Down @@

Documentation/devicetree/bindings/interconnect/qcom,sa8775p-rpmh.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,37 @@ allOf: @@
                 - description: aggre UFS CARD AXI clock
                 - description: RPMH CC IPA clock
+      - if:
+          properties:
+            compatible:
+              contains:
+                enum:
+                  - qcom,sa8775p-config-noc
+                  - qcom,sa8775p-dc-noc
+                  - qcom,sa8775p-gem-noc
+                  - qcom,sa8775p-gpdsp-anoc
+                  - qcom,sa8775p-lpass-ag-noc
+                  - qcom,sa8775p-mmss-noc
+                  - qcom,sa8775p-nspa-noc
+                  - qcom,sa8775p-nspb-noc
+                  - qcom,sa8775p-pcie-anoc
+                  - qcom,sa8775p-system-noc
+        then:
+          properties:
+            clocks: false
+      - if:
+          properties:
+            compatible:
+              contains:
+                enum:
+                  - qcom,sa8775p-clk-virt
+                  - qcom,sa8775p-mc-virt
+        then:
+          properties:
+            reg: false
+            clocks: false
     unevaluatedProperties: false
     examples:
@@ Expand Down @@

Documentation/misc-devices/amd-sbi.rst

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,7 +15,7 @@ and SB Temperature Sensor Interface (SB-TSI)).
  
    More details on the interface can be found in chapter

    "5 Advanced Platform Management Link (APML)" of the family/model PPR [1]_.

    .. [1] https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip

    .. [1] https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50

    SBRMI device

Documentation/netlink/specs/fou.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,8 @@ attribute-sets: @@
           -
             name: ipproto
             type: u8
+            checks:
+              min: 1
           -
             name: type
             type: u8
@@ Expand Down @@

Documentation/process/conclave.rst

-Original file line number
+Diff line change
@@ -0,0 +1,41 @@
+    .. SPDX-License-Identifier: GPL-2.0
+    Linux kernel project continuity
+    ===============================
+    The Linux kernel development project is widely distributed, with over
+maintainers each working to keep changes moving through their own
+    repositories. The final step, though, is a centralized one where changes
+    are pulled into the mainline repository. That is normally done by Linus
+    Torvalds but, as was demonstrated by the 4.19 release in 2018, there are
+    others who can do that work when the need arises.
+    Should the maintainers of that repository become unwilling or unable to
+    do that work going forward (including facilitating a transition), the
+    project will need to find one or more replacements without delay. The
+    process by which that will be done is listed below. $ORGANIZER is the
+    last Maintainer Summit organizer or the current Linux Foundation (LF)
+    Technical Advisory Board (TAB) Chair as a backup.
+    - Within 72 hours, $ORGANIZER will open a discussion with the invitees
+      of the most recently concluded Maintainers Summit. A meeting of those
+      invitees and the TAB, either online or in-person, will be set as soon
+      as possible in a way that maximizes the number of people who can
+      participate.
+    - If there has been no Maintainers Summit in the last 15 months, the set of
+      invitees for this meeting will be determined by the TAB.
+    - The invitees to this meeting may bring in other maintainers as needed.
+    - This meeting, chaired by $ORGANIZER, will consider options for the
+      ongoing management of the top-level kernel repository consistent with
+      the expectation that it maximizes the long term health of the project
+      and its community.
+    - Within two weeks, a representative of this group will communicate to the
+      broader community, using the ksummit@lists.linux.dev mailing list, what
+      the next steps will be.
+    The Linux Foundation, as guided by the TAB, will take the steps
+    necessary to support and implement this plan.

Documentation/process/index.rst

-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,7 @@ beyond). @@
        stable-kernel-rules
        management-style
        researcher-guidelines
+       conclave
     Dealing with bugs
     -----------------
@@ Expand Down @@

Documentation/process/maintainer-netdev.rst

-Original file line number
+Diff line change
@@ Expand Up @@
     with better review coverage. Re-posting large series also increases the mailing
     list traffic.
+    Limit patches outstanding on mailing list
+    -----------------------------------------
+    Avoid having more than 15 patches, across all series, outstanding for
+    review on the mailing list for a single tree. In other words, a maximum of
+patches under review on net, and a maximum of 15 patches under review on
+    net-next.
+    This limit is intended to focus developer effort on testing patches before
+    upstream review. Aiding the quality of upstream submissions, and easing the
+    load on reviewers.
     .. _rcs:
     Local variable ordering ("reverse xmas tree", "RCS")
@@ Expand Down @@

MAINTAINERS

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3132,6 +3132,7 @@ F:	drivers/*/*ma35*
  
    K:	ma35d1

    ARM/NUVOTON NPCM ARCHITECTURE

    M:	Andrew Jeffery <andrew@codeconstruct.com.au>

    M:	Avi Fishman <avifishman70@gmail.com>

    M:	Tomer Maimon <tmaimon77@gmail.com>

    M:	Tali Perry <tali.perry1@gmail.com>

    @@ -3140,6 +3141,7 @@ R:	Nancy Yuen <yuenn@google.com>
  
    R:	Benjamin Fair <benjaminfair@google.com>

    L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)

    S:	Supported

    T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git

    F:	Documentation/devicetree/bindings/*/*/*npcm*

    F:	Documentation/devicetree/bindings/*/*npcm*

    F:	Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml

    @@ -13170,6 +13172,7 @@ F:	Documentation/devicetree/bindings/interconnect/
  
    F:	Documentation/driver-api/interconnect.rst

    F:	drivers/interconnect/

    F:	include/dt-bindings/interconnect/

    F:	include/linux/interconnect-clk.h

    F:	include/linux/interconnect-provider.h

    F:	include/linux/interconnect.h

    @@ -18484,9 +18487,8 @@ F:	include/uapi/linux/nexthop.h
  
    F:	net/ipv4/nexthop.c

    NFC SUBSYSTEM

    M:	Krzysztof Kozlowski <krzk@kernel.org>

    L:	netdev@vger.kernel.org

    S:	Maintained

    S:	Orphan

    F:	Documentation/devicetree/bindings/net/nfc/

    F:	drivers/nfc/

    F:	include/net/nfc/

    @@ -22536,7 +22538,7 @@ F:	drivers/mailbox/riscv-sbi-mpxy-mbox.c
  
    F:	include/linux/mailbox/riscv-rpmi-message.h

    RISC-V SPACEMIT SoC Support

    M:	Yixun Lan <dlan@gentoo.org>

    M:	Yixun Lan <dlan@kernel.org>

    L:	linux-riscv@lists.infradead.org

    L:	spacemit@lists.linux.dev

    S:	Maintained

Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     VERSION = 6
     PATCHLEVEL = 19
     SUBLEVEL = 0
-    EXTRAVERSION = -rc6
+    EXTRAVERSION = -rc7
     NAME = Baby Opossum Posse
     # *DOCUMENTATION*
@@ Expand Down @@

arch/arm/boot/dts/microchip/lan966x-pcb8290.dts

-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ @@
     &mdio0 {
     	pinctrl-0 = <&miim_a_pins>;
     	pinctrl-names = "default";
+    	reset-gpios = <&gpio 53 GPIO_ACTIVE_LOW>;
     	status = "okay";
     	ext_phy0: ethernet-phy@7 {
@@ Expand Down @@

arch/arm/boot/dts/microchip/sama7d65.dtsi

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -527,7 +527,7 @@
  
    				interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

    				clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;

    				#address-cells = <1>;

    				#size-cells = <1>;

    				#size-cells = <0>;

    				dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,

    				       <&dma0 AT91_XDMAC_DT_PERID(11)>;

    				dma-names = "tx", "rx";

    @@ -676,7 +676,7 @@
  
    		flx9: flexcom@e2820000 {

    			compatible = "microchip,sama7d65-flexcom", "atmel,sama5d2-flexcom";

    			reg = <0xe2820000 0x200>;

    			ranges = <0x0 0xe281c000 0x800>;

    			ranges = <0x0 0xe2820000 0x800>;

    			clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;

    			#address-cells = <1>;

    			#size-cells = <1>;

arch/arm/mach-npcm/Kconfig

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ config ARCH_NPCM7XX @@
     	select ARM_ERRATA_764369 if SMP
     	select ARM_ERRATA_720789
     	select ARM_ERRATA_754322
-    	select ARM_ERRATA_794072
     	select PL310_ERRATA_588369
     	select PL310_ERRATA_727915
     	select MFD_SYSCON
@@ Expand Down @@

arch/arm64/boot/dts/nvidia/tegra210.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -202,19 +202,6 @@ @@
     			nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
     			nvidia,head = <0>;
-    			interconnects = <&mc TEGRA210_MC_DISPLAY0A &emc>,
-    					<&mc TEGRA210_MC_DISPLAY0B &emc>,
-    					<&mc TEGRA210_MC_DISPLAY0C &emc>,
-    					<&mc TEGRA210_MC_DISPLAYHC &emc>,
-    					<&mc TEGRA210_MC_DISPLAYD &emc>,
-    					<&mc TEGRA210_MC_DISPLAYT &emc>;
-    			interconnect-names = "wina",
-    					     "winb",
-    					     "winc",
-    					     "cursor",
-    					     "wind",
-    					     "wint";
     		};
     		dc@54240000 {
@@ Expand All / @@ -230,15 +217,6 @@ @@
     			nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
     			nvidia,head = <1>;
-    			interconnects = <&mc TEGRA210_MC_DISPLAY0AB &emc>,
-    					<&mc TEGRA210_MC_DISPLAY0BB &emc>,
-    					<&mc TEGRA210_MC_DISPLAY0CB &emc>,
-    					<&mc TEGRA210_MC_DISPLAYHCB &emc>;
-    			interconnect-names = "wina",
-    					     "winb",
-    					     "winc",
-    					     "cursor";
     		};
     		dsia: dsi@54300000 {
@@ Expand Down Expand Up / @@ -1052,7 +1030,6 @@ @@
     		#iommu-cells = <1>;
     		#reset-cells = <1>;
-    		#interconnect-cells = <1>;
     	};
     	emc: external-memory-controller@7001b000 {
@@ Expand All / @@ -1066,7 +1043,6 @@ @@
     		nvidia,memory-controller = <&mc>;
     		operating-points-v2 = <&emc_icc_dvfs_opp_table>;
-    		#interconnect-cells = <0>;
     		#cooling-cells = <2>;
     	};
@@ Expand Down @@

arch/arm64/boot/dts/qcom/sc8280xp.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -5788,8 +5788,12 @@ @@
     			clocks = <&rpmhcc RPMH_CXO_CLK>;
     			clock-names = "xo";
-    			power-domains = <&rpmhpd SC8280XP_NSP>;
-    			power-domain-names = "nsp";
+    			power-domains = <&rpmhpd SC8280XP_NSP>,
+    					<&rpmhpd SC8280XP_CX>,
+    					<&rpmhpd SC8280XP_MXC>;
+    			power-domain-names = "nsp",
+    					     "cx",
+    					     "mxc";
     			memory-region = <&pil_nsp0_mem>;
@@ Expand Down Expand Up / @@ -5919,8 +5923,12 @@ @@
     			clocks = <&rpmhcc RPMH_CXO_CLK>;
     			clock-names = "xo";
-    			power-domains = <&rpmhpd SC8280XP_NSP>;
-    			power-domain-names = "nsp";
+    			power-domains = <&rpmhpd SC8280XP_NSP>,
+    					<&rpmhpd SC8280XP_CX>,
+    					<&rpmhpd SC8280XP_MXC>;
+    			power-domain-names = "nsp",
+    					     "cx",
+    					     "mxc";
     			memory-region = <&pil_nsp1_mem>;
@@ Expand Down @@

arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -31,9 +31,9 @@
  
    };

    &display_panel {

    	status = "okay";

    	compatible = "samsung,sofef00-ams628nw01", "samsung,sofef00";

    	compatible = "samsung,sofef00";

    	status = "okay";

    };

    &bq27441_fg {

arch/arm64/boot/dts/qcom/sm8550.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -4133,8 +4133,6 @@ @@
     		usb_1: usb@a600000 {
     			compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";
     			reg = <0x0 0x0a600000 0x0 0xfc100>;
-    			#address-cells = <1>;
-    			#size-cells = <0>;
     			clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
     				 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ Expand Down @@

arch/arm64/boot/dts/qcom/sm8650.dtsi

-Original file line number
+Diff line change
@@ Expand Up / @@ -5150,9 +5150,6 @@ @@
     			dma-coherent;
-    			#address-cells = <1>;
-    			#size-cells = <0>;
     			status = "disabled";
     			ports {
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync update #44

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!