Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96f77410 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v4.20-rc6' into for-4.21/block 



Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents 58ab5e32 40e020c1

Documentation/ABI/testing/sysfs-class-net-dsa

+1 −1
Original line number Diff line number Diff line 
What:		/sys/class/net/<iface>/tagging

What:		/sys/class/net/<iface>/dsa/tagging

Date:		August 2018

KernelVersion:	4.20

Contact:	netdev@vger.kernel.org

Documentation/devicetree/bindings/clock/clock-bindings.txt

+16 −0
Original line number Diff line number Diff line
@@ -168,3 +168,19 @@ a shared clock is forbidden. 


Configuration of common clocks, which affect multiple consumer devices can

be similarly specified in the clock provider node.



==Protected clocks==



Some platforms or firmwares may not fully expose all the clocks to the OS, such

as in situations where those clks are used by drivers running in ARM secure

execution levels. Such a configuration can be specified in device tree with the

protected-clocks property in the form of a clock specifier list. This property should

only be specified in the node that is providing the clocks being protected:



   clock-controller@a000f000 {

        compatible = "vendor,clk95;

        reg = <0xa000f000 0x1000>

        #clocks-cells = <1>;

        ...

        protected-clocks = <UART3_CLK>, <SPI5_CLK>;

   };

Documentation/devicetree/bindings/input/input-reset.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ The /chosen node should contain a 'linux,sysrq-reset-seq' child node to define 
a set of keys.



Required property:

sysrq-reset-seq: array of Linux keycodes, one keycode per cell.

keyset: array of Linux keycodes, one keycode per cell.



Optional property:

timeout-ms: duration keys must be pressed together in milliseconds before

Documentation/devicetree/bindings/media/rockchip-vpu.txt

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
device-tree bindings for rockchip VPU codec



Rockchip (Video Processing Unit) present in various Rockchip platforms,

such as RK3288 and RK3399.



Required properties:

- compatible: value should be one of the following

		"rockchip,rk3288-vpu";

		"rockchip,rk3399-vpu";

- interrupts: encoding and decoding interrupt specifiers

- interrupt-names: should be "vepu" and "vdpu"

- clocks: phandle to VPU aclk, hclk clocks

- clock-names: should be "aclk" and "hclk"

- power-domains: phandle to power domain node

- iommus: phandle to a iommu node



Example:

SoC-specific DT entry:

	vpu: video-codec@ff9a0000 {

		compatible = "rockchip,rk3288-vpu";

		reg = <0x0 0xff9a0000 0x0 0x800>;

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vepu", "vdpu";

		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;

		clock-names = "aclk", "hclk";

		power-domains = <&power RK3288_PD_VIDEO>;

		iommus = <&vpu_mmu>;

	};

Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst

+25 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections

.. This file is dual-licensed: you can use it either under the terms

.. of the GPL or the GFDL 1.1+ license, at your option. Note that this

.. dual licensing only applies to this file, and not this project as a

.. whole.

..

.. a) This file is free software; you can redistribute it and/or

..    modify it under the terms of the GNU General Public License as

..    published by the Free Software Foundation; either version 2 of

..    the License, or (at your option) any later version.

..

..    This file is distributed in the hope that it will be useful,

..    but WITHOUT ANY WARRANTY; without even the implied warranty of

..    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

..    GNU General Public License for more details.

..

.. Or, alternatively,

..

.. b) Permission is granted to copy, distribute and/or modify this

..    document under the terms of the GNU Free Documentation License,

..    Version 1.1 or any later version published by the Free Software

..    Foundation, with no Invariant Sections, no Front-Cover Texts

..    and no Back-Cover Texts. A copy of the license is included at

..    Documentation/media/uapi/fdl-appendix.rst.

..

.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections



.. _media_ioc_request_alloc: