Commit aec53e60 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
  commit 077cdda7 ("net/mlx5e: TC, Fix memory leak with rules with internal port")
  commit 31108d14 ("net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'")
  commit 4390c6ed ("net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'")
  https://lore.kernel.org/all/20211229065352.30178-1-saeed@kernel.org/



net/smc/smc_wr.c
  commit 49dc9013 ("net/smc: Use the bitmap API when applicable")
  commit 349d4312 ("net/smc: fix kernel panic caused by race of smc_sock")
  bitmap_zero()/memset() is removed by the fix

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 49dc9013 74c78b42

Documentation/admin-guide/kernel-parameters.txt

+8 −2
Original line number Diff line number Diff line
@@ -1689,6 +1689,8 @@ 
			architectures force reset to be always executed

	i8042.unlock	[HW] Unlock (ignore) the keylock

	i8042.kbdreset	[HW] Reset device connected to KBD port

	i8042.probe_defer

			[HW] Allow deferred probing upon i8042 probe errors



	i810=		[HW,DRM]
@@ -2413,8 +2415,12 @@ 
			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)

			[KVM,Intel] Disable emulation of invalid guest state.

			Ignored if kvm-intel.enable_unrestricted_guest=1, as

			guest state is never invalid for unrestricted guests.

			This param doesn't apply to nested guests (L2), as KVM

			never emulates invalid L2 guest state.

			Default is 1 (enabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml

+25 −0
Original line number Diff line number Diff line
@@ -51,6 +51,19 @@ patternProperties: 
    description:

      Properties for single BUCK regulator.



    properties:

      op_mode:

        $ref: /schemas/types.yaml#/definitions/uint32

        enum: [0, 1, 2, 3]

        default: 1

        description: |

          Describes the different operating modes of the regulator with power

          mode change in SOC. The different possible values are:

            0 - always off mode

            1 - on in normal mode

            2 - low power mode

            3 - suspend mode



    required:

      - regulator-name
@@ -63,6 +76,18 @@ patternProperties: 
      Properties for single BUCK regulator.



    properties:

      op_mode:

        $ref: /schemas/types.yaml#/definitions/uint32

        enum: [0, 1, 2, 3]

        default: 1

        description: |

          Describes the different operating modes of the regulator with power

          mode change in SOC. The different possible values are:

            0 - always off mode

            1 - on in normal mode

            2 - low power mode

            3 - suspend mode



      s5m8767,pmic-ext-control-gpios:

        maxItems: 1

        description: |

Documentation/networking/ip-sysctl.rst

+4 −2
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ ip_default_ttl - INTEGER 
ip_no_pmtu_disc - INTEGER

	Disable Path MTU Discovery. If enabled in mode 1 and a

	fragmentation-required ICMP is received, the PMTU to this

	destination will be set to min_pmtu (see below). You will need

	destination will be set to the smallest of the old MTU to

	this destination and min_pmtu (see below). You will need

	to raise min_pmtu to the smallest interface MTU on your system

	manually if you want to avoid locally generated fragments.
@@ -49,7 +50,8 @@ ip_no_pmtu_disc - INTEGER 
	Default: FALSE



min_pmtu - INTEGER

	default 552 - minimum discovered Path MTU

	default 552 - minimum Path MTU. Unless this is changed mannually,

	each cached pmtu will never be lower than this setting.



ip_forward_use_pmtu - BOOLEAN

	By default we don't trust protocol path MTUs while forwarding

Documentation/sound/hd-audio/models.rst

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ usi-headset 
    Headset support on USI machines

dual-codecs

    Lenovo laptops with dual codecs

alc285-hp-amp-init

    HP laptops which require speaker amplifier initialization (ALC285)



ALC680

======

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -14852,7 +14852,7 @@ PCIE DRIVER FOR MEDIATEK 
M:	Ryder Lee <ryder.lee@mediatek.com>

M:	Jianjun Wang <jianjun.wang@mediatek.com>

L:	linux-pci@vger.kernel.org

L:	linux-mediatek@lists.infradead.org

L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	Documentation/devicetree/bindings/pci/mediatek*

F:	drivers/pci/controller/*mediatek*
@@ -17438,7 +17438,7 @@ F: drivers/video/fbdev/sm712* 
SILVACO I3C DUAL-ROLE MASTER

M:	Miquel Raynal <miquel.raynal@bootlin.com>

M:	Conor Culhane <conor.culhane@silvaco.com>

L:	linux-i3c@lists.infradead.org

L:	linux-i3c@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml

F:	drivers/i3c/master/svc-i3c-master.c
@@ -21074,7 +21074,7 @@ S: Maintained 
F:	arch/x86/kernel/cpu/zhaoxin.c









ZONEFS FILESYSTEM









M:	Damien Le Moal <damien.lemoal@wdc.com>









M:	Damien Le Moal <damien.lemoal@opensource.wdc.com>









M:	Naohiro Aota <naohiro.aota@wdc.com>









R:	Johannes Thumshirn <jth@kernel.org>









L:	linux-fsdevel@vger.kernel.org