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

Commit 89b1698c authored by David S. Miller's avatar David S. Miller
Browse files

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 



The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ffd7ce3c e30cb13c

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

+2 −1
Original line number Original line 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.

the node is not important. The content of the node is defined in dwc3.txt.





Phy documentation is provided in the following places:

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:

Example device nodes:

Documentation/networking/dpaa2/overview.rst

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

.. include:: <isonum.txt>





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

DPAA2 (Data Path Acceleration Architecture Gen2) Overview

DPAA2 (Data Path Acceleration Architecture Gen2) Overview

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

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

MAINTAINERS

+2 −1
Original line number Original line Diff line number Diff line
@@ -7095,6 +7095,7 @@ F: include/uapi/linux/input.h 
F:	include/uapi/linux/input-event-codes.h

F:	include/uapi/linux/input-event-codes.h

F:	include/linux/input/

F:	include/linux/input/

F:	Documentation/devicetree/bindings/input/

F:	Documentation/devicetree/bindings/input/

F:	Documentation/devicetree/bindings/serio/

F:	Documentation/input/

F:	Documentation/input/





INPUT MULTITOUCH (MT) PROTOCOL

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

F:	tools/testing/selftests/kmod/





KPROBES

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:	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>

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

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

M:	Masami Hiramatsu <mhiramat@kernel.org>

M:	Masami Hiramatsu <mhiramat@kernel.org>

Makefile

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

VERSION = 4

PATCHLEVEL = 18

PATCHLEVEL = 18

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Merciless Moray

NAME = Merciless Moray





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/kernel/entry-common.S

+3 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ saved_pc .req lr 
 * from those features make this path too inefficient.

 * from those features make this path too inefficient.

 */

 */

ret_fast_syscall:

ret_fast_syscall:

__ret_fast_syscall:

 UNWIND(.fnstart	)

 UNWIND(.fnstart	)

 UNWIND(.cantunwind	)

 UNWIND(.cantunwind	)

	disable_irq_notrace			@ disable interrupts

	disable_irq_notrace			@ disable interrupts
@@ -78,6 +79,7 @@ fast_work_pending: 
 * call.

 * call.

 */

 */

ret_fast_syscall:

ret_fast_syscall:

__ret_fast_syscall:

 UNWIND(.fnstart	)

 UNWIND(.fnstart	)

 UNWIND(.cantunwind	)

 UNWIND(.cantunwind	)

	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0

	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0
@@ -255,7 +257,7 @@ local_restart: 
	tst	r10, #_TIF_SYSCALL_WORK		@ are we tracing syscalls?

	tst	r10, #_TIF_SYSCALL_WORK		@ are we tracing syscalls?

	bne	__sys_trace

	bne	__sys_trace





	invoke_syscall tbl, scno, r10, ret_fast_syscall

	invoke_syscall tbl, scno, r10, __ret_fast_syscall





	add	r1, sp, #S_OFF

	add	r1, sp, #S_OFF

2:	cmp	scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)

2:	cmp	scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)