Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 20 Jan 2023 20:28:23 +0000 (12:28 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 20 Jan 2023 20:28:23 +0000 (12:28 -0800)
commitb3c588cd553d6996cc97f3dc0a7081b9a9b36b48
tree37e51018ad3f74bf91a7b4a54a0893d048440bd1
parent7a590bd6b42ffa12b16956f37742cc04ec15545e
parent5deaa98587aca2f0e7605388e89cfa1df4bad5cb
Merge git://git./linux/kernel/git/netdev/net

drivers/net/ipa/ipa_interrupt.c
drivers/net/ipa/ipa_interrupt.h
  9ec9b2a30853 ("net: ipa: disable ipa interrupt during suspend")
  8e461e1f092b ("net: ipa: introduce ipa_interrupt_enable()")
  d50ed3558719 ("net: ipa: enable IPA interrupt handlers separate from registration")
https://lore.kernel.org/all/20230119114125.5182c7ab@canb.auug.org.au/
https://lore.kernel.org/all/79e46152-8043-a512-79d9-c3b905462774@tessares.net/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
22 files changed:
MAINTAINERS
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
drivers/net/ethernet/amd/xgbe/xgbe.h
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/freescale/enetc/enetc.c
drivers/net/ethernet/mellanox/mlx5/core/en/params.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ipa/ipa_interrupt.c
drivers/net/ipa/ipa_interrupt.h
drivers/net/ipa/ipa_power.c
drivers/net/phy/mdio_bus.c
drivers/net/virtio_net.c
include/linux/bpf.h
kernel/bpf/syscall.c
kernel/bpf/verifier.c
kernel/trace/bpf_trace.c
net/ipv4/inet_hashtables.c
net/mptcp/protocol.c
net/mptcp/protocol.h
net/netfilter/nf_conntrack_proto_tcp.c