www.infradead.org Git - users/dwmw2/linux.git/commit

]> www.infradead.org Git - users/dwmw2/linux.git/commit

projects / users / dwmw2 / linux.git / commit

author	Paolo Abeni <pabeni@redhat.com>
	Wed, 3 Aug 2022 06:50:42 +0000 (08:50 +0200)
committer	Paolo Abeni <pabeni@redhat.com>
	Wed, 3 Aug 2022 07:04:55 +0000 (09:04 +0200)
commit	7c6327c77d509e78bff76f2a4551fcfee851682e
tree	9e5e128945eadd50462620927ed915fb88fb6eb1	tree
parent	6f63d04473f2bc973e24ff828a28a2bd5e41bb38	commit \| diff
parent	8eaa1d110800fac050bab44001732747a1c39894	commit \| diff

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

Conflicts:

net/ax25/af_ax25.c
  d7c4c9e075f8c ("ax25: fix incorrect dev_tracker usage")
  d62607c3fe459 ("net: rename reference+tracking helpers")

drivers/net/netdevsim/fib.c
  180a6a3ee60a ("netdevsim: fib: Fix reference count leak on route deletion failure")
  012ec02ae441 ("netdevsim: convert driver to use unlocked devlink API during init/fini")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/net/ethernet/intel/iavf/iavf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netdevsim/fib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ax88179_178a.c	diff1 \|	diff2 \|	blob \| history
include/net/xdp_sock_drv.h	diff1 \|	diff2 \|	blob \| history
net/ax25/af_ax25.c	diff1 \|	diff2 \|	blob \| history