summaryrefslogtreecommitdiff
path: root/net/batman-adv/tp_meter.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/tp_meter.h')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-03-29 01:44:33 +0000
parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/can/core.h7
-rw-r--r--include/linux/fscache-cache.h1
-rw-r--r--include/linux/netdevice.h29
-rw-r--r--include/linux/nfs4.h3
-rw-r--r--include/linux/percpu-refcount.h4
-rw-r--r--include/linux/sunrpc/clnt.h1
-rw-r--r--include/net/ipv6.h5
-rw-r--r--include/soc/arc/mcip.h16
-rw-r--r--include/uapi/linux/ethtool.h4
9 files changed, 40 insertions, 30 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h