Commit cba65321 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:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 26879da5 7391daf2

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ Felix Kuhling <fxkuehl@gmx.de> 
Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Zago <fzago@systemfabricworks.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>
@@ -79,6 +82,7 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

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

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ RK3xxx SoCs. 
Required properties :



 - reg : Offset and length of the register set for the device

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c" or

		"rockchip,rk3288-i2c".

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c",

		"rockchip,rk3228-i2c" or "rockchip,rk3288-i2c".

 - interrupts : interrupt number

 - clocks : parent clock

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ Required properties: 
Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy_id		: Specifies slave phy id (deprecated, use phy-handle)

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: Exactly one of phy_id, phy-handle, or fixed-link must be specified.



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

Documentation/networking/altera_tse.txt

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ This is the driver for the Altera Triple-Speed Ethernet (TSE) controllers 
using the SGDMA and MSGDMA soft DMA IP components. The driver uses the

platform bus to obtain component resources. The designs used to test this

driver were built for a Cyclone(R) V SOC FPGA board, a Cyclone(R) V FPGA board,

and tested with ARM and NIOS processor hosts seperately. The anticipated use

and tested with ARM and NIOS processor hosts separately. The anticipated use

cases are simple communications between an embedded system and an external peer

for status and simple configuration of the embedded system.
@@ -65,14 +65,14 @@ Driver parameters can be also passed in command line by using: 
4.1) Transmit process

When the driver's transmit routine is called by the kernel, it sets up a

transmit descriptor by calling the underlying DMA transmit routine (SGDMA or

MSGDMA), and initites a transmit operation. Once the transmit is complete, an

MSGDMA), and initiates a transmit operation. Once the transmit is complete, an

interrupt is driven by the transmit DMA logic. The driver handles the transmit

completion in the context of the interrupt handling chain by recycling

resource required to send and track the requested transmit operation.



4.2) Receive process

The driver will post receive buffers to the receive DMA logic during driver

intialization. Receive buffers may or may not be queued depending upon the

initialization. Receive buffers may or may not be queued depending upon the

underlying DMA logic (MSGDMA is able queue receive buffers, SGDMA is not able

to queue receive buffers to the SGDMA receive logic). When a packet is

received, the DMA logic generates an interrupt. The driver handles a receive

Documentation/networking/ipvlan.txt

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Initial Release: 
	This is conceptually very similar to the macvlan driver with one major

exception of using L3 for mux-ing /demux-ing among slaves. This property makes

the master device share the L2 with it's slave devices. I have developed this

driver in conjuntion with network namespaces and not sure if there is use case

driver in conjunction with network namespaces and not sure if there is use case

outside of it.
@@ -56,7 +56,7 @@ situations defines your use case then you can choose to use ipvlan - 
	(a) The Linux host that is connected to the external switch / router has

policy configured that allows only one mac per port.

	(b) No of virtual devices created on a master exceed the mac capacity and

puts the NIC in promiscous mode and degraded performance is a concern.

puts the NIC in promiscuous mode and degraded performance is a concern.

	(c) If the slave device is to be put into the hostile / untrusted network

namespace where L2 on the slave could be changed / misused.