Commit f4915933 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.14-rc8).

Conflict:

tools/testing/selftests/net/Makefile
  03544faa ("selftest: net: add proc_net_pktgen")
  3ed61b89 ("selftests: net: test for lwtunnel dst ref loops")

tools/testing/selftests/net/config:
  85cb3711 ("selftests: net: Add test cases for link and peer netns")
  3ed61b89 ("selftests: net: test for lwtunnel dst ref loops")

Adjacent commits:

tools/testing/selftests/net/Makefile
  c935af42 ("selftests: net: add support for testing SO_RCVMARK and SO_RCVPRIORITY")
  355d940f ("Revert "selftests: Add IPv6 link-local address generation tests for GRE devices."")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 6855b9be 5fc31936

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ Henrik Rydberg <rydberg@bitmath.org> 
Herbert Xu <herbert@gondor.apana.org.au>

Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>

Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>

Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>

J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>

J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>

Jacob Shin <Jacob.Shin@amd.com>

Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - imagis,ist3038

      - imagis,ist3038b

      - imagis,ist3038c

      - imagis,ist3038h



  reg:

    maxItems: 1

Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ allOf: 
            const: renesas,r8a779h0-canfd

    then:

      patternProperties:

        "^channel[5-7]$": false

        "^channel[4-7]$": false

    else:

      if:

        not:

Documentation/rust/quick-start.rst

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ Rust standard library source 
****************************



The Rust standard library source is required because the build system will

cross-compile ``core`` and ``alloc``.

cross-compile ``core``.



If ``rustup`` is being used, run::

Documentation/rust/testing.rst

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ operator are also supported as usual, e.g.: 


	/// ```

	/// # use kernel::{spawn_work_item, workqueue};

	/// spawn_work_item!(workqueue::system(), || pr_info!("x"))?;

	/// spawn_work_item!(workqueue::system(), || pr_info!("x\n"))?;

	/// # Ok::<(), Error>(())

	/// ```