Merge tag 'v4.20-rc7' into perf/core, to pick up fixes (76aea1ee) · Commits · e / devices / android_kernel_fairphone_FP5

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -2541,6 +2541,10 @@ S: Ormond
		S: Victoria 3163
		S: Australia

		N: Eric Miao
		E: eric.y.miao@gmail.com
		D: MMP support

		N: Pauline Middelink
		E: middelin@polyware.nl
		D: General low-level bug fixes, /proc fixes, identd support
		@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5
		S: Bellevue, Washington 98007
		S: USA

		N: Haojian Zhuang
		E: haojian.zhuang@gmail.com
		D: MMP support

		N: Richard Zidlicky
		E: rz@linux-m68k.org, rdzidlic@geocities.com
		W: http://www.geocities.com/rdzidlic

+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

+4 −1

Original line number	Diff line number	Diff line
		@@ -187,6 +187,8 @@ Takes xa_lock internally:
		* :c:func:`xa_erase_bh`
		* :c:func:`xa_erase_irq`
		* :c:func:`xa_cmpxchg`
		* :c:func:`xa_cmpxchg_bh`
		* :c:func:`xa_cmpxchg_irq`
		* :c:func:`xa_store_range`
		* :c:func:`xa_alloc`
		* :c:func:`xa_alloc_bh`
		@@ -263,7 +265,8 @@ using :c:func:`xa_lock_irqsave` in both the interrupt handler and process
		context, or :c:func:`xa_lock_irq` in process context and :c:func:`xa_lock`
		in the interrupt handler. Some of the more common patterns have helper
		functions such as :c:func:`xa_store_bh`, :c:func:`xa_store_irq`,
		:c:func:`xa_erase_bh` and :c:func:`xa_erase_irq`.
		:c:func:`xa_erase_bh`, :c:func:`xa_erase_irq`, :c:func:`xa_cmpxchg_bh`
		and :c:func:`xa_cmpxchg_irq`.

		Sometimes you need to protect access to the XArray with a mutex because
		that lock sits above another mutex in the locking hierarchy. That does

+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>;
		};

+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