Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 20 Aug 2021 01:09:18 +0000 (18:09 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 20 Aug 2021 01:09:18 +0000 (18:09 -0700)
commitf444fea7896dbc267249d27f604082a51b8efca2
treed72e809d28ff7a1cb02f648c858d106de1be859d
parent9e5f10fe577be7974c721c0c2050fa6c967d4565
parentf87d64319e6f980c82acfc9b95ed523d053fb7ac
Merge git://git./linux/kernel/git/netdev/net

drivers/ptp/Kconfig:
  55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
  e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
20 files changed:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt.h
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
drivers/net/ethernet/intel/iavf/iavf.h
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/usb/r8152.c
drivers/net/virtio_net.c
drivers/net/vrf.c
drivers/ptp/Kconfig
drivers/vdpa/mlx5/net/mlx5_vnet.c
include/net/flow_offload.h
init/main.c
kernel/bpf/helpers.c
kernel/bpf/verifier.c
mm/memcontrol.c
net/mptcp/options.c
net/mptcp/pm_netlink.c
net/sched/sch_cake.c
net/tipc/socket.c