]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit65c9b60895aa054bc5dca744a2a9f379bd26f2ab
treed72e809d28ff7a1cb02f648c858d106de1be859d
parent8bbbf77b27f9e731b2e87a122374c82db06d310d
parent3f4828a4550c213fa8b600f095dae86ca65c0766
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/ptp/Kconfig:
  d160bae3b6cd ("ptp_pch: Restore dependency on PCI")
  c9562a80857d ("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