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

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

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



Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7bdaae27 cec4de30

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −1
Original line number Diff line number Diff line 
Device-Tree bindings for input/gpio_keys.c keyboard driver

Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver



Required properties:

	- compatible = "gpio-keys";

Documentation/fb/uvesafb.txt

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ than x86. Check the v86d documentation for a list of currently supported 
arches.



v86d source code can be downloaded from the following website:

  http://dev.gentoo.org/~spock/projects/uvesafb



  https://github.com/mjanusz/v86d



Please refer to the v86d documentation for detailed configuration and

installation instructions.
@@ -177,7 +178,7 @@ from the Video BIOS if you set pixclock to 0 in fb_var_screeninfo. 


--

 Michal Januszewski <spock@gentoo.org>

 Last updated: 2009-03-30

 Last updated: 2017-10-10



 Documentation of the uvesafb options is loosely based on vesafb.txt.

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ tcp_mtu_probing - INTEGER 
	  1 - Disabled by default, enabled when an ICMP black hole detected

	  2 - Always enabled, use initial MSS of tcp_base_mss.



tcp_probe_interval - INTEGER

tcp_probe_interval - UNSIGNED INTEGER

	Controls how often to start TCP Packetization-Layer Path MTU

	Discovery reprobe. The default is reprobing every 10 minutes as

	per RFC4821.

MAINTAINERS

+20 −14
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ N: meson 


ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

M:	Antoine Tenart <antoine.tenart@bootlin.com>

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

S:	Maintained

F:	arch/arm/mach-alpine/
@@ -2956,7 +2956,6 @@ F: include/linux/bcm963xx_tag.h 


BROADCOM BNX2 GIGABIT ETHERNET DRIVER

M:	Rasesh Mody <rasesh.mody@cavium.com>

M:	Harish Patil <harish.patil@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

L:	netdev@vger.kernel.org

S:	Supported
@@ -2977,6 +2976,7 @@ F: drivers/scsi/bnx2i/ 


BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

M:	Ariel Elior <ariel.elior@cavium.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@cavium.com>

M:	everest-linux-l2@cavium.com

L:	netdev@vger.kernel.org

S:	Supported
@@ -5470,7 +5470,8 @@ S: Odd Fixes 
F:	drivers/net/ethernet/agere/



ETHERNET BRIDGE

M:	Stephen Hemminger <stephen@networkplumber.org>

M:	Roopa Prabhu <roopa@cumulusnetworks.com>

M:	Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

L:	bridge@lists.linux-foundation.org (moderated for non-subscribers)

L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net:Bridge
@@ -9725,13 +9726,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ 
S:	Maintained

F:	drivers/media/dvb-frontends/mn88473*



PCI DRIVER FOR MOBIVEIL PCIE IP

M:	Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/mobiveil-pcie.txt

F:	drivers/pci/controller/pcie-mobiveil.c



MODULE SUPPORT

M:	Jessica Yu <jeyu@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@ -10958,7 +10952,7 @@ M: Willy Tarreau <willy@haproxy.com> 
M:	Ksenija Stanojevic <ksenija.stanojevic@gmail.com>

S:	Odd Fixes

F:	Documentation/auxdisplay/lcd-panel-cgram.txt

F:	drivers/misc/panel.c

F:	drivers/auxdisplay/panel.c



PARALLEL PORT SUBSYSTEM

M:	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -11146,6 +11140,13 @@ F: include/uapi/linux/switchtec_ioctl.h 
F:	include/linux/switchtec.h

F:	drivers/ntb/hw/mscc/



PCI DRIVER FOR MOBIVEIL PCIE IP

M:	Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/mobiveil-pcie.txt

F:	drivers/pci/controller/pcie-mobiveil.c



PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

M:	Jason Cooper <jason@lakedaemon.net>
@@ -11212,8 +11213,14 @@ F: tools/pci/ 


PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC

M:	Russell Currey <ruscur@russell.cc>

M:	Sam Bobroff <sbobroff@linux.ibm.com>

M:	Oliver O'Halloran <oohall@gmail.com>

L:	linuxppc-dev@lists.ozlabs.org

S:	Supported

F:	Documentation/PCI/pci-error-recovery.txt

F:	drivers/pci/pcie/aer.c

F:	drivers/pci/pcie/dpc.c

F:	drivers/pci/pcie/err.c

F:	Documentation/powerpc/eeh-pci-error-recovery.txt

F:	arch/powerpc/kernel/eeh*.c

F:	arch/powerpc/platforms/*/eeh*.c
@@ -11982,7 +11989,7 @@ F: Documentation/scsi/LICENSE.qla4xxx 
F:	drivers/scsi/qla4xxx/



QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER

M:	Harish Patil <harish.patil@cavium.com>

M:	Shahed Shaikh <Shahed.Shaikh@cavium.com>

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

L:	netdev@vger.kernel.org
@@ -11990,7 +11997,6 @@ S: Supported 
F:	drivers/net/ethernet/qlogic/qlcnic/



QLOGIC QLGE 10Gb ETHERNET DRIVER

M:	Harish Patil <harish.patil@cavium.com>

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

L:	netdev@vger.kernel.org
@@ -15398,7 +15404,7 @@ S: Maintained 
UVESAFB DRIVER

M:	Michal Januszewski <spock@gentoo.org>

L:	linux-fbdev@vger.kernel.org

W:	http://dev.gentoo.org/~spock/projects/uvesafb/

W:	https://github.com/mjanusz/v86d

S:	Maintained

F:	Documentation/fb/uvesafb.txt

F:	drivers/video/fbdev/uvesafb.*

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Merciless Moray



# *DOCUMENTATION*