Unverified Commit 1e17ed83 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

Merge drm/drm-next into drm-misc-next 



Bring v6.17-rc2 in to unstuck for-linux-next.

Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parents dab74906 dd489c01

Documentation/ABI/stable/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ Contact: linux-block@vger.kernel.org 
Description:

		[RW] If the device is registered for writeback throttling, then

		this file shows the target minimum read latency. If this latency

		is exceeded in a given window of time (see wb_window_usec), then

		is exceeded in a given window of time (see curr_win_nsec), then

		the writeback throttling will start scaling back writes. Writing

		a value of '0' to this file disables the feature. Writing a

		value of '-1' to this file resets the value to the default

Documentation/admin-guide/blockdev/zoned_loop.rst

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ zone_capacity_mb Device zone capacity (must always be equal to or lower than 
                   the zone size. Default: zone size.

conv_zones         Total number of conventioanl zones starting from sector 0.

                   Default: 8.

base_dir           Path to the base directoy where to create the directory

base_dir           Path to the base directory where to create the directory

                   containing the zone files of the device.

                   Default=/var/local/zloop.

                   The device directory containing the zone files is always

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

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ Spectre_v1 X 
Spectre_v2            X                           X

Spectre_v2_user                      X                           X            *       (Note 1)

SRBDS                 X              X            X              X

SRSO                  X                           X

SRSO                  X              X            X              X

SSB                                                                                   (Note 4)

TAA                   X              X            X              X            *       (Note 2)

TSA                   X              X            X              X

Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml

+4 −2
Original line number Diff line number Diff line
@@ -62,11 +62,13 @@ properties: 
    items:

      - description: GMAC main clock

      - description: Peripheral registers interface clock

      - description: APB glue registers interface clock



  clock-names:

    items:

      - const: stmmaceth

      - const: pclk

      - const: apb



  interrupts:

    items:
@@ -88,8 +90,8 @@ examples: 
        compatible = "thead,th1520-gmac", "snps,dwmac-3.70a";

        reg = <0xe7070000 0x2000>, <0xec003000 0x1000>;

        reg-names = "dwmac", "apb";

        clocks = <&clk 1>, <&clk 2>;

        clock-names = "stmmaceth", "pclk";

        clocks = <&clk 1>, <&clk 2>, <&clk 3>;

        clock-names = "stmmaceth", "pclk", "apb";

        interrupts = <66>;

        interrupt-names = "macirq";

        phy-mode = "rgmii-id";

Documentation/networking/ip-sysctl.rst

+1 −1
Original line number Diff line number Diff line
@@ -1420,7 +1420,7 @@ udp_hash_entries - INTEGER 
	A negative value means the networking namespace does not own its

	hash buckets and shares the initial networking namespace's one.



udp_child_ehash_entries - INTEGER

udp_child_hash_entries - INTEGER

	Control the number of hash buckets for UDP sockets in the child

	networking namespace, which must be set before clone() or unshare().