Commit 94adb5e2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 36875a06 6d36c728

Documentation/admin-guide/cgroup-v2.rst

+23 −0
Original line number Diff line number Diff line
@@ -976,6 +976,29 @@ All cgroup core files are prefixed with "cgroup." 
	killing cgroups is a process directed operation, i.e. it affects

	the whole thread-group.



  cgroup.pressure

	A read-write single value file that allowed values are "0" and "1".

	The default is "1".



	Writing "0" to the file will disable the cgroup PSI accounting.

	Writing "1" to the file will re-enable the cgroup PSI accounting.



	This control attribute is not hierarchical, so disable or enable PSI

	accounting in a cgroup does not affect PSI accounting in descendants

	and doesn't need pass enablement via ancestors from root.



	The reason this control attribute exists is that PSI accounts stalls for

	each cgroup separately and aggregates it at each level of the hierarchy.

	This may cause non-negligible overhead for some workloads when under

	deep level of the hierarchy, in which case this control attribute can

	be used to disable PSI accounting in the non-leaf cgroups.



  irq.pressure

	A read-write nested-keyed file.



	Shows pressure stall information for IRQ/SOFTIRQ. See

	:ref:`Documentation/accounting/psi.rst <psi>` for details.



Controllers

===========

Documentation/admin-guide/device-mapper/verity.rst

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ root_hash_sig_key_desc <key_description> 
    also gain new certificates at run time if they are signed by a certificate

    already in the secondary trusted keyring.



try_verify_in_tasklet

    If verity hashes are in cache, verify data blocks in kernel tasklet instead

    of workqueue. This option can reduce IO latency.



Theory of operation

===================

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A55      | #1530923        | ARM64_ERRATUM_1530923       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A55      | #2441007        | ARM64_ERRATUM_2441007       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A57      | #832075         | ARM64_ERRATUM_832075        |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A57      | #852523         | N/A                         |

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ properties: 
          - enum:

              - allwinner,sun20i-d1-plic

          - const: thead,c900-plic

      - items:

          - const: sifive,plic-1.0.0

          - const: riscv,plic0

        deprecated: true

        description: For the QEMU virt machine only



  reg:

    maxItems: 1

Documentation/devicetree/bindings/leds/common.yaml

+21 −18
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ properties: 
      the LED.

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



    enum:

    oneOf:

      - enum:

            # LED will act as a back-light, controlled by the framebuffer system

          - backlight

            # LED will turn on (but for leds-gpio see "default-state" property in
@@ -97,6 +98,8 @@ properties: 
            # LED alters the brightness for the specified duration with one software

            # timer (requires "led-pattern" property)

          - pattern

        # LED is triggered by SD/MMC activity

      - pattern: "^mmc[0-9]+$"



  led-pattern:

    description: |