Commit 41e3ddb2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR.

Conflicts:

include/trace/events/rpcgss.h
  386f4a73 ("trace: events: cleanup deprecated strncpy uses")
  a4833e3a ("SUNRPC: Fix rpcgss_context trace event acceptor field")

Adjacent changes:

drivers/net/ethernet/intel/ice/ice_tc_lib.c
  2cca35f5 ("ice: Fix checking for unsupported keys on non-tunnel device")
  784feaa6 ("ice: Add support for PFCP hardware offload in switchdev")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents aa37f891 7586c850

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -3146,6 +3146,10 @@ S: Triftstra=DFe 55 
S: 13353 Berlin

S: Germany



N: Gustavo Pimental

E: gustavo.pimentel@synopsys.com

D: PCI driver for Synopsys DesignWare



N: Emanuel Pirker

E: epirker@edu.uni-klu.ac.at

D: AIC5800 IEEE 1394, RAW I/O on 1394

Documentation/admin-guide/hw-vuln/spectre.rst

+9 −13
Original line number Diff line number Diff line
@@ -439,12 +439,12 @@ The possible values in this file are: 
   - System is protected by retpoline

 * - BHI: BHI_DIS_S

   - System is protected by BHI_DIS_S

 * - BHI: SW loop; KVM SW loop

 * - BHI: SW loop, KVM SW loop

   - System is protected by software clearing sequence

 * - BHI: Syscall hardening

   - Syscalls are hardened against BHI

 * - BHI: Syscall hardening; KVM: SW loop

   - System is protected from userspace attacks by syscall hardening; KVM is protected by software clearing sequence

 * - BHI: Vulnerable

   - System is vulnerable to BHI

 * - BHI: Vulnerable, KVM: SW loop

   - System is vulnerable; KVM is protected by software clearing sequence



Full mitigation might require a microcode update from the CPU

vendor. When the necessary microcode is not available, the kernel will
@@ -661,18 +661,14 @@ kernel command line. 
	spectre_bhi=



		[X86] Control mitigation of Branch History Injection

		(BHI) vulnerability. Syscalls are hardened against BHI

		regardless of this setting. This setting affects the deployment

		(BHI) vulnerability.  This setting affects the deployment

		of the HW BHI control and the SW BHB clearing sequence.



		on

			unconditionally enable.

			(default) Enable the HW or SW mitigation as

			needed.

		off

			unconditionally disable.

		auto

			enable if hardware mitigation

			control(BHI_DIS_S) is available, otherwise

			enable alternate mitigation in KVM.

			Disable the mitigation.



For spectre_v2_user see Documentation/admin-guide/kernel-parameters.txt

Documentation/admin-guide/kernel-parameters.txt

+5 −7
Original line number Diff line number Diff line
@@ -3444,6 +3444,7 @@ 
					       retbleed=off [X86]

					       spec_rstack_overflow=off [X86]

					       spec_store_bypass_disable=off [X86,PPC]

					       spectre_bhi=off [X86]

					       spectre_v2_user=off [X86]

					       srbds=off [X86,INTEL]

					       ssbd=force-off [ARM64]
@@ -6064,16 +6065,13 @@ 
			See Documentation/admin-guide/laptops/sonypi.rst



	spectre_bhi=	[X86] Control mitigation of Branch History Injection

			(BHI) vulnerability. Syscalls are hardened against BHI

			reglardless of this setting. This setting affects the

			(BHI) vulnerability.  This setting affects the

			deployment of the HW BHI control and the SW BHB

			clearing sequence.



			on   - unconditionally enable.

			off  - unconditionally disable.

			auto - (default) enable hardware mitigation

			       (BHI_DIS_S) if available, otherwise enable

			       alternate mitigation in KVM.

			on   - (default) Enable the HW or SW mitigation

			       as needed.

			off  - Disable the mitigation.



	spectre_v2=	[X86,EARLY] Control mitigation of Spectre variant 2

			(indirect branch speculation) vulnerability.

Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ patternProperties: 
      compatible:

        const: qcom,sm8150-dpu



  "^displayport-controller@[0-9a-f]+$":

    type: object

    additionalProperties: true



    properties:

      compatible:

        contains:

          const: qcom,sm8150-dp



  "^dsi@[0-9a-f]+$":

    type: object

    additionalProperties: true

Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ properties: 
      - const: main

      - const: mm



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg