Commit 31f1aa4f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
  2871edb3 ("can: kvaser_usb: Fix possible completions during init_completion")
  abb86709 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")
  8d21f592 ("can: kvaser_usb_leaf: Fix improved state not being reported")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 12d6c1d3 23758867

Documentation/admin-guide/media/vivid.rst

+1 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ instance. This setup would require the following commands: 
	$ v4l2-ctl -d2 -i2

	$ v4l2-ctl -d2 -c horizontal_movement=4

	$ v4l2-ctl -d1 --overlay=1

	$ v4l2-ctl -d1 -c loop_video=1

	$ v4l2-ctl -d0 -c loop_video=1

	$ v4l2-ctl -d2 --stream-mmap --overlay=1



And from another console:

Documentation/core-api/kernel-api.rst

+6 −0
Original line number Diff line number Diff line
@@ -118,6 +118,12 @@ Text Searching 
CRC and Math Functions in Linux

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



Arithmetic Overflow Checking

----------------------------



.. kernel-doc:: include/linux/overflow.h

   :internal:



CRC Functions

-------------

Documentation/driver-api/basics.rst

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ Kernel utility functions 
.. kernel-doc:: kernel/panic.c

   :export:



.. kernel-doc:: include/linux/overflow.h

   :internal:



Device Resource Management

--------------------------

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -15438,6 +15438,7 @@ S: Maintained 
W:	http://openvswitch.org

F:	include/uapi/linux/openvswitch.h

F:	net/openvswitch/

F:	tools/testing/selftests/net/openvswitch/









OPERATING PERFORMANCE POINTS (OPP)









M:	Viresh Kumar <vireshk@kernel.org>
































arch/arc/boot/dts/axc003.dtsi



+2
−2






























Original line number
Diff line number
Diff line







@@ -103,11 +103,11 @@







			dma-coherent;









		};



















		ehci@40000 {









		usb@40000 {









			dma-coherent;









		};



















		ohci@60000 {









		usb@60000 {









			dma-coherent;









		};