git.kernel.dk Git - linux-block.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 14 Oct 2021 23:50:14 +0000 (16:50 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 14 Oct 2021 23:50:14 +0000 (16:50 -0700)
commit	e15f5972b8031f9069f41e24adff63bd34463b3a
tree	d31c80ea86df9cdd9f8189dc2a89603aac57402f	tree \| snapshot
parent	8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8	commit \| diff
parent	ec681c53f8d2d0ee362ff67f5b98dd8263c15002	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

tools/testing/selftests/net/ioam6.sh
7b1700e009cc ("selftests: net: modify IOAM tests for undef bits")
bf77b1400a56 ("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	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/arc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microchip/encx24j600.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/mana_en.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/neterion/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/hwif.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/dsa/ocelot.h	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_ocelot.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ioam6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ioam6_iptunnel.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_mqprio.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/ioam6.sh	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

drivers/net/dsa/ocelot/felix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/arc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microchip/encx24j600.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/mana_en.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/neterion/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/hwif.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/dsa/ocelot.h	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_ocelot.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ioam6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ioam6_iptunnel.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_mqprio.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/ioam6.sh	diff1 \|	diff2 \|	blob \| history