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

Commit b3e0d3d7 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/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3268e5cb 73796d8b

Documentation/devicetree/bindings/dma/ti-edma.txt

+4 −6
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ Required properties: 
Optional properties:

- ti,hwmods:	Name of the hwmods associated to the eDMA CC

- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow

		these channels will be SW triggered channels. The list must

		contain 16 bits numbers, see example.

		these channels will be SW triggered channels. See example.

- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by

		the driver, they are allocated to be used by for example the

		DSP. See example.
@@ -56,10 +55,9 @@ edma: edma@49000000 { 
	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;



	/* Channel 20 and 21 is allocated for memcpy */

	ti,edma-memcpy-channels = /bits/ 16 <20 21>;

	/* The following PaRAM slots are reserved: 35-45 and 100-110 */

	ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,

				       /bits/ 16 <100 10>;

	ti,edma-memcpy-channels = <20 21>;

	/* The following PaRAM slots are reserved: 35-44 and 100-109 */

	ti,edma-reserved-slot-ranges = <35 10>, <100 10>;

};



edma_tptc0: tptc@49800000 {

Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ Required properties: 
      0 = active high

      1 = active low



Optional properties:

- little-endian : GPIO registers are used as little endian. If not

                  present registers are used as big endian by default.



Example:



gpio0: gpio@1100 {

Documentation/networking/e100.txt

+0 −14
Original line number Diff line number Diff line
@@ -181,17 +181,3 @@ For general information, go to the Intel support website at: 
If an issue is identified with the released source code on the supported

kernel with a supported adapter, email the specific information related to the

issue to e1000-devel@lists.sourceforge.net.
 




License

=======



This software program is released under the terms of a license agreement

between you ('Licensee') and Intel. Do not use or load this software or any

associated materials (collectively, the 'Software') until you have carefully

read the full terms and conditions of the file COPYING located in this software

package. By loading or using the Software, you agree to the terms of this

Agreement. If you do not agree with the terms of this Agreement, do not install

or use the Software.



* Other names and brands may be claimed as the property of others.

MAINTAINERS

+14 −4
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ M: Zhang Rui <rui.zhang@intel.com> 
L:	linux-acpi@vger.kernel.org

W:	https://01.org/linux-acpi

S:	Supported

F:	drivers/acpi/video.c

F:	drivers/acpi/acpi_video.c



ACPI WMI DRIVER

L:	platform-driver-x86@vger.kernel.org
@@ -2984,6 +2984,7 @@ F: kernel/cpuset.c 
CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)

M:	Johannes Weiner <hannes@cmpxchg.org>

M:	Michal Hocko <mhocko@kernel.org>

M:	Vladimir Davydov <vdavydov@virtuozzo.com>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org

S:	Maintained
@@ -5586,7 +5587,7 @@ R: Jesse Brandeburg <jesse.brandeburg@intel.com> 
R:	Shannon Nelson <shannon.nelson@intel.com>

R:	Carolyn Wyborny <carolyn.wyborny@intel.com>

R:	Don Skidmore <donald.c.skidmore@intel.com>

R:	Matthew Vick <matthew.vick@intel.com>

R:	Bruce Allan <bruce.w.allan@intel.com>

R:	John Ronciak <john.ronciak@intel.com>

R:	Mitch Williams <mitch.a.williams@intel.com>

L:	intel-wired-lan@lists.osuosl.org
@@ -8302,7 +8303,7 @@ F: include/linux/delayacct.h 
F:	kernel/delayacct.c



PERFORMANCE EVENTS SUBSYSTEM

M:	Peter Zijlstra <a.p.zijlstra@chello.nl>

M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

M:	Arnaldo Carvalho de Melo <acme@kernel.org>

L:	linux-kernel@vger.kernel.org
@@ -8961,6 +8962,13 @@ F: drivers/rpmsg/ 
F:	Documentation/rpmsg.txt

F:	include/linux/rpmsg.h



RENESAS ETHERNET DRIVERS

R:	Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

L:	netdev@vger.kernel.org

L:	linux-sh@vger.kernel.org

F:	drivers/net/ethernet/renesas/

F:	include/linux/sh_eth.h



RESET CONTROLLER FRAMEWORK

M:	Philipp Zabel <p.zabel@pengutronix.de>

S:	Maintained
@@ -9443,8 +9451,10 @@ F: include/scsi/sg.h 


SCSI SUBSYSTEM

M:	"James E.J. Bottomley" <JBottomley@odin.com>

L:	linux-scsi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git

M:	"Martin K. Petersen" <martin.petersen@oracle.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git

L:	linux-scsi@vger.kernel.org

S:	Maintained

F:	drivers/scsi/

F:	include/scsi/

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc5

NAME = Blurry Fish Butt



# *DOCUMENTATION*