www.infradead.org Git - users/willy/xarray.git/commit

]> www.infradead.org Git - users/willy/xarray.git/commit

projects / users / willy / xarray.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Mon, 10 Jan 2022 00:59:30 +0000 (16:59 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Mon, 10 Jan 2022 01:00:17 +0000 (17:00 -0800)
commit	8aaaf2f3af2ae212428f4db1af34214225f5cec3
tree	43c7f4f8af2fad7919f169b0924dba5e43147d97	tree
parent	208dd45d8d050360b46ded439a057bcc7cbf3b09	commit \| diff
parent	dd3ca4c5184ea98e40acb8eb293d85b88ea04ee2	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Merge in fixes directly in prep for the 5.17 merge window.
No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

26 files changed:

drivers/net/amt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/rcar/rcar_canfd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/xilinx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_payload.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ct.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.h	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_output.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history

XArray, radix tree and IDR

RSS Atom

drivers/net/amt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/rcar/rcar_canfd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/xilinx_can.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_payload.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ct.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.h	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_output.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history