Commit 0140a716 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

drivers/net/ethernet/freescale/fec.h
  7b15515f ("Revert "fec: Restart PPS after link state change"")
  40c79ce1 ("net: fec: add stop mode support for imx8 platform")
https://lore.kernel.org/all/20220921105337.62b41047@canb.auug.org.au/

drivers/pinctrl/pinctrl-ocelot.c
  c297561b ("pinctrl: ocelot: Fix interrupt controller")
  181f604b ("pinctrl: ocelot: add ability to be used in a non-mmio configuration")
https://lore.kernel.org/all/20220921110032.7cd28114@canb.auug.org.au/

tools/testing/selftests/drivers/net/bonding/Makefile
  bbb774d9 ("net: Add tests for bonding and team address list management")
  152e8ec7 ("selftests/bonding: add a test for bonding lladdr target")
https://lore.kernel.org/all/20220921110437.5b7dbd82@canb.auug.org.au/

drivers/net/can/usb/gs_usb.c
  5440428b ("can: gs_usb: gs_can_open(): fix race dev->can.state condition")
  45dfa45f ("can: gs_usb: add RX and TX hardware timestamp support")
https://lore.kernel.org/all/84f45a7d-92b6-4dc5-d7a1-072152fab6ff@tessares.net/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f8b2cce4 504c25cb

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ Morten Welinder <welinder@troll.com> 
Mythri P K <mythripk@ti.com>

Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>

Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" 
title: Amlogic Meson Firmware registers Interface



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>



description: |

  The Meson SoCs have a register bank with status and data shared with the

Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" 
title: Amlogic specific extensions to the Synopsys Designware HDMI Controller



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>



allOf:

  - $ref: /schemas/sound/name-prefix.yaml#

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" 
title: Amlogic Meson Display Controller



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>



description: |

  The Amlogic Meson Display controller is composed of several components

Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter) 


maintainers:

  - Andrzej Hajda <andrzej.hajda@intel.com>

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>

  - Robert Foss <robert.foss@linaro.org>



properties: