]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 14 Oct 2021 23:50:14 +0000 (16:50 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 Oct 2021 23:50:14 +0000 (16:50 -0700)
commit1564af38f88545a26a8296083320eef365c5ab26
treed31c80ea86df9cdd9f8189dc2a89603aac57402f
parent8d339428d4d934bd7423650f6d9ce09afd073dcc
parent38c1c422607e4e0556ca6feaecdd460e5c4604bf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

tools/testing/selftests/net/ioam6.sh
  cd364913ce76 ("selftests: net: modify IOAM tests for undef bits")
  fd6105a61ad9 ("selftests: net: Test for the IOAM encapsulation with IPv6")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
23 files changed:
drivers/net/dsa/ocelot/felix.c
drivers/net/ethernet/arc/Kconfig
drivers/net/ethernet/intel/ice/ice_ptp.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/microchip/encx24j600.c
drivers/net/ethernet/microsoft/mana/mana_en.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/ethernet/mscc/ocelot_net.c
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/stmicro/stmmac/hwif.h
drivers/net/phy/phy_device.c
drivers/net/virtio_net.c
include/linux/dsa/ocelot.h
net/dsa/dsa2.c
net/dsa/tag_ocelot.c
net/ipv6/ioam6.c
net/ipv6/ioam6_iptunnel.c
net/mptcp/protocol.c
net/sched/sch_mqprio.c
net/smc/smc_core.c
tools/testing/selftests/net/ioam6.sh