Commit a6ec08be 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.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  1e796211 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
  165f8769 ("bnxt_en: add timestamping statistics support")

No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a012f9a7 d5a7fc58

.editorconfig

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ root = true 
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = true

insert_final_newline = true

indent_style = tab

indent_size = 8
@@ -13,7 +12,6 @@ indent_size = 8 
[*.{json,py,rs}]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = true

insert_final_newline = true

indent_style = space

indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8 
[*.yaml]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = unset

insert_final_newline = true

indent_style = space

indent_size = 2

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Documentation/admin-guide/kernel-parameters.txt

+0 −6
Original line number Diff line number Diff line
@@ -2192,12 +2192,6 @@ 
			Format: 0 | 1

			Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.



	init_mlocked_on_free=	[MM] Fill freed userspace memory with zeroes if

				it was mlock'ed and not explicitly munlock'ed

				afterwards.

				Format: 0 | 1

				Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON



	init_pkru=	[X86] Specify the default memory protection keys rights

			register contents for all processes.  0x55555554 by

			default (disallow access to all but pkey 0).  Can

Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ allOf: 
                Voltage output range of the channel as <minimum, maximum>

                Required connections:

                  Rfb1x for: 0 to 2.5 V; 0 to 3V; 0 to 5 V;

                  Rfb2x for: 0 to 10 V; 2.5 to 7.5V; -5 to 5 V;

                  Rfb2x for: 0 to 10 V; -2.5 to 7.5V; -5 to 5 V;

              oneOf:

                - items:

                    - const: 0

Documentation/devicetree/bindings/usb/realtek,rts5411.yaml

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ patternProperties: 
    description: The hard wired USB devices

    type: object

    $ref: /schemas/usb/usb-device.yaml

    additionalProperties: true



required:

  - peer-hub