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

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



The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure.  The resolution used here is
from Petr Machata.

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

Documentation/dev-tools/kcov.rst

+5 −5
Original line number Diff line number Diff line
@@ -251,11 +251,11 @@ selectively from different subsystems. 
.. code-block:: c



    struct kcov_remote_arg {

	unsigned	trace_mode;

	unsigned	area_size;

	unsigned	num_handles;

	uint64_t	common_handle;

	uint64_t	handles[0];

	__u32		trace_mode;

	__u32		area_size;

	__u32		num_handles;

	__aligned_u64	common_handle;

	__aligned_u64	handles[0];

    };



    #define KCOV_INIT_TRACE			_IOR('c', 1, unsigned long)

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/features/debug/gcov-profile-all/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: |  ok  |

    |       sparc: | TODO |

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,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?

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE