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

Commit 076ce448 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/ethernet/chelsio/cxgb4vf/sge.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

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

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

+4 −1
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ Required properties: 
			    - "renesas,thermal-r8a73a4" (R-Mobile AP6)

			    - "renesas,thermal-r8a7779" (R-Car H1)

			    - "renesas,thermal-r8a7790" (R-Car H2)

			    - "renesas,thermal-r8a7791" (R-Car M2)

			    - "renesas,thermal-r8a7791" (R-Car M2-W)

			    - "renesas,thermal-r8a7792" (R-Car V2H)

			    - "renesas,thermal-r8a7793" (R-Car M2-N)

			    - "renesas,thermal-r8a7794" (R-Car E2)

- reg			: Address range of the thermal registers.

			  The 1st reg will be recognized as common register

			  if it has "interrupts".

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -3621,7 +3621,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	usb-storage.delay_use=

			[UMS] The delay in seconds before a new device is

			scanned for Logical Units (default 5).

			scanned for Logical Units (default 1).



	usb-storage.quirks=

			[UMS] A list of quirks entries to supplement or

Documentation/video4linux/vivid.txt

+5 −7
Original line number Diff line number Diff line
@@ -221,12 +221,11 @@ ccs_out_mode: specify the allowed video output crop/compose/scaling combination 
		       key, not quality.



multiplanar: select whether each device instance supports multi-planar formats,

	and thus the V4L2 multi-planar API. By default the first device instance

	is single-planar, the second multi-planar, and it keeps alternating.

	and thus the V4L2 multi-planar API. By default device instances are

	single-planar.



	This module option can override that for each instance. Values are:



		0: use alternating single and multi-planar devices.

		1: this is a single-planar instance.

		2: this is a multi-planar instance.
@@ -975,9 +974,8 @@ is set, then the alpha component is only used for the color red and set to 
0 otherwise.



The driver has to be configured to support the multiplanar formats. By default

the first driver instance is single-planar, the second is multi-planar, and it

keeps alternating. This can be changed by setting the multiplanar module option,

see section 1 for more details on that option.

the driver instances are single-planar. This can be changed by setting the

multiplanar module option, see section 1 for more details on that option.



If the driver instance is using the multiplanar formats/API, then the first

single planar format (YUYV) and the multiplanar NV16M and NV61M formats the
@@ -1021,7 +1019,7 @@ the output overlay for the video output, turn on video looping and capture 
to see the blended framebuffer overlay that's being written to by the second

instance. This setup would require the following commands:



	$ sudo modprobe vivid n_devs=2 node_types=0x10101,0x1 multiplanar=1,1

	$ sudo modprobe vivid n_devs=2 node_types=0x10101,0x1

	$ v4l2-ctl -d1 --find-fb

	/dev/fb1 is the framebuffer associated with base address 0x12800000

	$ sudo v4l2-ctl -d2 --set-fbuf fb=1

MAINTAINERS

+11 −11
Original line number Diff line number Diff line
@@ -1543,6 +1543,7 @@ F: arch/arm/mach-pxa/include/mach/z2.h 


ARM/ZYNQ ARCHITECTURE

M:	Michal Simek <michal.simek@xilinx.com>

R:	Sören Brinkmann <soren.brinkmann@xilinx.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://wiki.xilinx.com

T:	git git://git.xilinx.com/linux-xlnx.git
@@ -2071,8 +2072,9 @@ F: drivers/clocksource/bcm_kona_timer.c 


BROADCOM BCM2835 ARM ARCHITECTURE

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Lee Jones <lee@kernel.org>

L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git

S:	Maintained

N:	bcm2835
@@ -4320,8 +4322,10 @@ F: Documentation/blockdev/cpqarray.txt 
F:	drivers/block/cpqarray.*



HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)

M:	"Stephen M. Cameron" <scameron@beardog.cce.hp.com>

M:	Don Brace <don.brace@pmcs.com>

L:	iss_storagedev@hp.com

L:	storagedev@pmcs.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/scsi/hpsa.txt

F:	drivers/scsi/hpsa*.[ch]
@@ -4329,8 +4333,10 @@ F: include/linux/cciss*.h 
F:	include/uapi/linux/cciss*.h



HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)

M:	Mike Miller <mike.miller@hp.com>

M:	Don Brace <don.brace@pmcs.com>

L:	iss_storagedev@hp.com

L:	storagedev@pmcs.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/blockdev/cciss.txt

F:	drivers/block/cciss*
@@ -4725,6 +4731,7 @@ L: linux-iio@vger.kernel.org 
S:	Maintained

F:	drivers/iio/

F:	drivers/staging/iio/

F:	include/linux/iio/



IKANOS/ADI EAGLE ADSL USB DRIVER

M:	Matthieu Castet <castet.matthieu@free.fr>
@@ -7195,6 +7202,7 @@ F: drivers/crypto/picoxcell* 


PIN CONTROL SUBSYSTEM

M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-gpio@vger.kernel.org

S:	Maintained

F:	drivers/pinctrl/

F:	include/linux/pinctrl/
@@ -8499,7 +8507,6 @@ F: arch/arm/mach-s3c24xx/bast-irq.c 
TI DAVINCI MACHINE SUPPORT

M:	Sekhar Nori <nsekhar@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

T:	git git://gitorious.org/linux-davinci/linux-davinci.git

Q:	http://patchwork.kernel.org/project/linux-davinci/list/

S:	Supported
@@ -8509,7 +8516,6 @@ F: drivers/i2c/busses/i2c-davinci.c 
TI DAVINCI SERIES MEDIA DRIVER

M:	Lad, Prabhakar <prabhakar.csengg@gmail.com>

L:	linux-media@vger.kernel.org

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

W:	http://linuxtv.org/

Q:	http://patchwork.linuxtv.org/project/linux-media/list/

T:	git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
@@ -9626,7 +9632,6 @@ F: drivers/staging/unisys/ 


UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER

M:	Vinayak Holikatti <vinholikatti@gmail.com>

M:	Santosh Y <santoshsy@gmail.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/scsi/ufs.txt
@@ -9720,11 +9725,6 @@ S: Maintained 
F:	Documentation/hid/hiddev.txt

F:	drivers/hid/usbhid/



USB/IP DRIVERS

L:	linux-usb@vger.kernel.org

S:	Orphan

F:	drivers/staging/usbip/



USB ISP116X DRIVER

M:	Olav Kongas <ok@artecdesign.ee>

L:	linux-usb@vger.kernel.org

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc2

NAME = Shuffling Zombie Juror

EXTRAVERSION = -rc4

NAME = Diseased Newt



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"