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

drivers/net/ethernet/microchip/lan966x/lan966x_main.c
  d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")
  c8349639324a ("net: lan966x: Add FDMA functionality")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --cc Documentation/networking/ip-sysctl.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/microchip/lan966x/lan966x_main.c
index 106d8c8,95830e3..afec115
--- 1/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
--- 2/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
@@@ -687,8 -672,8 +687,11 @@@ static void lan966x_cleanup_ports(struc
                lan966x->ana_irq = -ENXIO;
        }
  
 +      if (lan966x->fdma)
 +              devm_free_irq(lan966x->dev, lan966x->fdma_irq, lan966x);
++
+       if (lan966x->ptp_irq)
+               devm_free_irq(lan966x->dev, lan966x->ptp_irq, lan966x);
  }
  
  static int lan966x_probe_port(struct lan966x *lan966x, u32 p,

diff --cc net/can/isotp.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge