Commit 4aea86b4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0471005e 50011c32

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
*.o.*

*.patch

*.rmeta

*.rpm

*.rsi

*.s

*.so

Documentation/ABI/testing/sysfs-kernel-warn_count

+1 −1
Original line number Diff line number Diff line 
What:		/sys/kernel/oops_count

What:		/sys/kernel/warn_count

Date:		November 2022

KernelVersion:	6.2.0

Contact:	Linux Kernel Hardening List <linux-hardening@vger.kernel.org>

Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: ROHM BD71828 Power Management Integrated Circuit LED driver



maintainers:

  - Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>

  - Matti Vaittinen <mazziesaccount@gmail.com>



description: |

  This module is part of the ROHM BD71828 MFD device. For more details

Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - mediatek,mt8173-gce

      - mediatek,mt8183-gce

      - mediatek,mt8186-gce

      - mediatek,mt8188-gce

      - mediatek,mt8192-gce

      - mediatek,mt8195-gce

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
              - qcom,sc8180x-apss-shared

              - qcom,sdm660-apcs-hmss-global

              - qcom,sdm845-apss-shared

              - qcom,sm4250-apcs-hmss-global

              - qcom,sm6125-apcs-hmss-global

              - qcom,sm6115-apcs-hmss-global

              - qcom,sm8150-apss-shared