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

Commit 432b3529 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge LTS tag v4.18-rc8 into msm-kona"

parents 8331850a 481ae06d

Documentation/devicetree/bindings/usb/rockchip,dwc3.txt

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ A child node must exist to represent the core DWC3 IP block. The name of 
the node is not important. The content of the node is defined in dwc3.txt.



Phy documentation is provided in the following places:

Documentation/devicetree/bindings/phy/qcom-dwc3-usb-phy.txt

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt - USB2.0 PHY

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt     - Type-C PHY



Example device nodes:

Documentation/networking/dpaa2/overview.rst

+1 −0
Original line number Diff line number Diff line 
.. include:: <isonum.txt>



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

DPAA2 (Data Path Acceleration Architecture Gen2) Overview

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

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -5444,6 +5444,7 @@ F: drivers/iommu/exynos-iommu.c 


EZchip NPS platform support

M:	Vineet Gupta <vgupta@synopsys.com>

M:	Ofer Levi <oferle@mellanox.com>

S:	Supported

F:	arch/arc/plat-eznps

F:	arch/arc/boot/dts/eznps.dts
@@ -7095,6 +7096,7 @@ F: include/uapi/linux/input.h 
F:	include/uapi/linux/input-event-codes.h

F:	include/linux/input/

F:	Documentation/devicetree/bindings/input/

F:	Documentation/devicetree/bindings/serio/

F:	Documentation/input/



INPUT MULTITOUCH (MT) PROTOCOL
@@ -7984,7 +7986,7 @@ F: lib/test_kmod.c 
F:	tools/testing/selftests/kmod/



KPROBES

M:	Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>

M:	Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>

M:	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>

M:	"David S. Miller" <davem@davemloft.net>

M:	Masami Hiramatsu <mhiramat@kernel.org>

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc8

NAME = Merciless Moray



# *DOCUMENTATION*

arch/arc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ config ARC 
	select HAVE_KERNEL_LZMA

	select ARCH_HAS_PTE_SPECIAL



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



config MIGHT_HAVE_PCI

	bool