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

Commit 6e03f896 authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents db79a621 9d82f5eb

Documentation/devicetree/bindings/i2c/i2c-st.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ i2c0: i2c@fed40000 { 
	compatible	= "st,comms-ssc4-i2c";

	reg		= <0xfed40000 0x110>;

	interrupts	=  <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

	clocks		= <&CLK_S_ICN_REG_0>;

	clocks		= <&clk_s_a0_ls CLK_ICN_REG>;

	clock-names	= "ssc";

	clock-frequency = <400000>;

	pinctrl-names	= "default";

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM 
dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O

dallas,ds75		Digital Thermometer and Thermostat

dlg,da9053		DA9053: flexible system level PMIC with multicore support

dlg,da9063		DA9063: system PMIC for quad-core application processors

epson,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE

epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE

fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

Documentation/networking/netlink_mmap.txt

+3 −10
Original line number Diff line number Diff line
@@ -199,16 +199,9 @@ frame header. 
TX limitations

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



Kernel processing usually involves validation of the message received by

user-space, then processing its contents. The kernel must assure that

userspace is not able to modify the message contents after they have been

validated. In order to do so, the message is copied from the ring frame

to an allocated buffer if either of these conditions is false:



- only a single mapping of the ring exists

- the file descriptor is not shared between processes



This means that for threaded programs, the kernel will fall back to copying.

As of Jan 2015 the message is always copied from the ring frame to an

allocated buffer due to unresolved security concerns.

See commit 4682a0358639b29cf ("netlink: Always copy on mmap TX.").



Example

-------

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd* 
F:	drivers/staging/iio/*/ad*

F:	staging/iio/trigger/iio-trig-bfin-timer.c



ANDROID DRIVERS

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

M:	Arve Hjønnevåg <arve@android.com>

M:	Riley Andrews <riandrews@android.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git

L:	devel@driverdev.osuosl.org

S:	Supported

F:	drivers/android/

F:	drivers/staging/android/



AOA (Apple Onboard Audio) ALSA DRIVER

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linuxppc-dev@lists.ozlabs.org
@@ -10181,6 +10191,7 @@ USERSPACE I/O (UIO) 
M:	"Hans J. Koch" <hjk@hansjkoch.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

F:	Documentation/DocBook/uio-howto.tmpl

F:	drivers/uio/

F:	include/linux/uio*.h

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Diseased Newt



# *DOCUMENTATION*