Commit 2523816d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.5-rc6 into char-misc-next 



We need the char-misc fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 16bb7abc b3a987b0

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

+4 −2
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ Optional properties: 
- dma-names: should contain "tx" and "rx".

- atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO

  capable I2C controllers.

- i2c-sda-hold-time-ns: TWD hold time, only available for "atmel,sama5d4-i2c"

  and "atmel,sama5d2-i2c".

- i2c-sda-hold-time-ns: TWD hold time, only available for:

	"atmel,sama5d4-i2c",

	"atmel,sama5d2-i2c",

	"microchip,sam9x60-i2c".

- Child nodes conforming to i2c bus binding



Examples :

Documentation/devicetree/bindings/spi/spi-controller.yaml

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ patternProperties: 
      spi-rx-bus-width:

        allOf:

          - $ref: /schemas/types.yaml#/definitions/uint32

          - enum: [ 1, 2, 4 ]

          - enum: [ 1, 2, 4, 8 ]

          - default: 1

        description:

          Bus width to the SPI bus used for MISO.
@@ -123,7 +123,7 @@ patternProperties: 
      spi-tx-bus-width:

        allOf:

          - $ref: /schemas/types.yaml#/definitions/uint32

          - enum: [ 1, 2, 4 ]

          - enum: [ 1, 2, 4, 8 ]

          - default: 1

        description:

          Bus width to the SPI bus used for MOSI.

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ tcp_synack_retries - INTEGER 
	with the current initial RTO of 1second. With this the final timeout

	for a passive TCP connection will happen after 63seconds.



tcp_syncookies - BOOLEAN

tcp_syncookies - INTEGER

	Only valid when the kernel was compiled with CONFIG_SYN_COOKIES

	Send out syncookies when the syn backlog queue of a socket

	overflows. This is to prevent against the common 'SYN flood attack'

Documentation/networking/netdev-FAQ.rst

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ the names, the ``net`` tree is for fixes to existing code already in the 
mainline tree from Linus, and ``net-next`` is where the new code goes

for the future release.  You can find the trees here:



- https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git

- https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

- https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

- https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git



Q: How often do changes from these trees make it to the mainline Linus tree?

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

MAINTAINERS

+5 −8
Original line number Diff line number Diff line
@@ -11460,8 +11460,8 @@ M: "David S. Miller" <davem@davemloft.net> 
L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net

Q:	http://patchwork.ozlabs.org/project/netdev/list/

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

S:	Odd Fixes

F:	Documentation/devicetree/bindings/net/

F:	drivers/net/
@@ -11502,8 +11502,8 @@ M: "David S. Miller" <davem@davemloft.net> 
L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net

Q:	http://patchwork.ozlabs.org/project/netdev/list/

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

B:	mailto:netdev@vger.kernel.org

S:	Maintained

F:	net/
@@ -11548,7 +11548,7 @@ M: "David S. Miller" <davem@davemloft.net> 
M:	Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>

M:	Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

L:	netdev@vger.kernel.org

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

S:	Maintained

F:	net/ipv4/

F:	net/ipv6/
@@ -13679,7 +13679,6 @@ F: drivers/net/ethernet/qualcomm/emac/ 








QUALCOMM ETHQOS ETHERNET DRIVER









M:	Vinod Koul <vkoul@kernel.org>









M:	Niklas Cassel <niklas.cassel@linaro.org>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c










@@ -14549,8 +14548,6 @@ F:	include/linux/platform_data/spi-s3c64xx.h















SAMSUNG SXGBE DRIVERS









M:	Byungho An <bh74.an@samsung.com>









M:	Girish K S <ks.giri@samsung.com>









M:	Vipul Pandya <vipul.pandya@samsung.com>









S:	Supported









L:	netdev@vger.kernel.org









F:	drivers/net/ethernet/samsung/sxgbe/