www.infradead.org Git - users/jedix/linux-maple.git/commit

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

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 3 Nov 2022 18:38:42 +0000 (11:38 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 3 Nov 2022 20:21:54 +0000 (13:21 -0700)
commit	fbeb229a6622523c092a13c02bd0e15f69240dde
tree	a48bf5ff455cedae6555ef071e0d8bdb29487824	tree
parent	d9095f92950bd16745b9ec24ebebc12d14b3a3e8	commit \| diff
parent	9521c9d6a53df9c44a5f5ddbc229ceaf3cf79ef6	commit \| diff

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

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/adi/adin1110.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
include/net/netlink.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_payload.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/adi/adin1110.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
include/net/netlink.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_payload.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/datapath.c	diff1 \|	diff2 \|	blob \| history