torvalds-linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-18 20:40:22 +00:00

History

Paolo Abeni 7c6327c77d 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>

2022-08-03 09:04:55 +02:00

bpf.c

netdevsim: Avoid allocation warnings triggered from user space

2022-07-29 14:57:26 -07:00

bus.c

netdevsim: convert driver to use unlocked devlink API during init/fini

2022-07-18 20:10:48 -07:00

dev.c

net: devlink: convert reload command to take implicit devlink->lock

2022-08-01 12:14:00 +01:00

ethtool.c

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