diff options
| author | Paolo Abeni | 2022-08-03 08:50:42 +0200 |
|---|---|---|
| committer | Paolo Abeni | 2022-08-03 09:04:55 +0200 |
| commit | 7c6327c77d509e78bff76f2a4551fcfee851682e (patch) | |
| tree | 9e5e128945eadd50462620927ed915fb88fb6eb1 /kernel | |
| parent | 6f63d04473f2bc973e24ff828a28a2bd5e41bb38 (diff) | |
| parent | 8eaa1d110800fac050bab44001732747a1c39894 (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>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions