Commit 18808564 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up the fixes that went upstream via acme/perf/urgent and to get
to v5.19.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 9a0b3626 3d7cb6b0

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ Arnd Bergmann <arnd@arndb.de> 
Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Gardner <bgardner@wabtec.com>

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3176,6 +3176,7 @@ 
					       no_entry_flush [PPC]

					       no_uaccess_flush [PPC]

					       mmio_stale_data=off [X86]

					       retbleed=off [X86]



				Exceptions:

					       This does not have any effect on
@@ -3198,6 +3199,7 @@ 
					       mds=full,nosmt [X86]

					       tsx_async_abort=full,nosmt [X86]

					       mmio_stale_data=full,nosmt [X86]

					       retbleed=auto,nosmt [X86]



	mminit_loglevel=

			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this

Documentation/devicetree/bindings/net/ethernet-controller.yaml

+59 −64
Original line number Diff line number Diff line
@@ -167,10 +167,8 @@ properties: 
      - in-band-status



  fixed-link:

    allOf:

      - if:

          type: array

        then:

    oneOf:

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

        deprecated: true

        items:

          - minimum: 0
@@ -196,11 +194,8 @@ properties: 
            description:

              Asymmetric pause configuration. 0 for no asymmetric

              pause, 1 for asymmetric pause





      - if:

          type: object

        then:

      - type: object

        additionalProperties: false

        properties:

          speed:

            description:

Documentation/devicetree/bindings/net/fsl,fec.yaml

+3 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ properties: 
      Should specify the gpio for phy reset.



  phy-reset-duration:

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

    deprecated: true

    description:

      Reset duration in milliseconds.  Should present only if property
@@ -191,12 +192,14 @@ properties: 
      and 1 millisecond will be used instead.



  phy-reset-active-high:

    type: boolean

    deprecated: true

    description:

      If present then the reset sequence using the GPIO specified in the

      "phy-reset-gpios" property is reversed (H=reset state, L=operation state).



  phy-reset-post-delay:

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

    deprecated: true

    description:

      Post reset delay in milliseconds. If present then a delay of phy-reset-post-delay

Documentation/networking/ip-sysctl.rst

+8 −1
Original line number Diff line number Diff line
@@ -2866,7 +2866,14 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max 
	Default: 4K



sctp_wmem  - vector of 3 INTEGERs: min, default, max

	Currently this tunable has no effect.

	Only the first value ("min") is used, "default" and "max" are

	ignored.



	min: Minimum size of send buffer that can be used by SCTP sockets.

	It is guaranteed to each SCTP socket (but not association) even

	under moderate memory pressure.



	Default: 4K



addr_scope_policy - INTEGER

	Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00