summaryrefslogtreecommitdiff
path: root/net/iucv
ModeNameSize
-rw-r--r--Kconfig568logplain
-rw-r--r--Makefile88logplain
-rw-r--r--af_iucv.c61350logplain
-rw-r--r--iucv.c53981logplain
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-15 14:56:01 +0000
cd585ccf48f360a4 (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 'net/ipv6')
-rw-r--r--net/ipv6/ip6_output.c2
-rw-r--r--net/ipv6/ip6_tunnel.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c