Commit edab1ca5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR (net-7.0-rc5).

net/netfilter/nft_set_rbtree.c
  598adea7 ("netfilter: revert nft_set_rbtree: validate open interval overlap")
  3aea466a ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock")
https://lore.kernel.org/abgaQBpeGstdN4oq@sirena.org.uk



No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9ac76f3d a1d9d8e8

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,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>

Ignat Korchagin <ignat@linux.win> <ignat@cloudflare.com>

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>

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -8196,6 +8196,9 @@ Kernel parameters 
				p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT

					(Reduce timeout of the SET_ADDRESS

					request from 5000 ms to 500 ms);

				q = USB_QUIRK_FORCE_ONE_CONFIG (Device

					claims zero configurations,

					forcing to 1);

			Example: quirks=0781:5580:bk,0a5c:5834:gij



	usbhid.mousepoll=

Documentation/dev-tools/kunit/run_wrapper.rst

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ command line arguments: 
- ``--list_tests_attr``: If set, lists all tests that will be run and all of their

  attributes.



- ``--list_suites``: If set, lists all suites that will be run.



Command-line completion

==============================

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+20 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ allOf: 
            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only

              - qcom,glymur-dp

              - qcom,sc8280xp-dp

              - qcom,x1e80100-dp

    then:
@@ -310,6 +309,26 @@ allOf: 
          minItems: 6

          maxItems: 8



  - if:

      properties:

        compatible:

          contains:

            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only, but all controllers have 4 ports

              - qcom,glymur-dp

    then:

      properties:

        reg:

          minItems: 9

          maxItems: 9

        clocks:

          minItems: 5

          maxItems: 6

        clocks-names:

          minItems: 5

          maxItems: 6



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/display/msm/qcom,glymur-mdss.yaml

+10 −6
Original line number Diff line number Diff line
@@ -176,13 +176,17 @@ examples: 
                };

            };



            displayport-controller@ae90000 {

            displayport-controller@af54000 {

                compatible = "qcom,glymur-dp";

                reg = <0xae90000 0x200>,

                      <0xae90200 0x200>,

                      <0xae90400 0x600>,

                      <0xae91000 0x400>,

                      <0xae91400 0x400>;

                reg = <0xaf54000 0x200>,

                      <0xaf54200 0x200>,

                      <0xaf55000 0xc00>,

                      <0xaf56000 0x400>,

                      <0xaf57000 0x400>,

                      <0xaf58000 0x400>,

                      <0xaf59000 0x400>,

                      <0xaf5a000 0x600>,

                      <0xaf5b000 0x600>;



                interrupt-parent = <&mdss>;

                interrupts = <12>;