git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 764f4eb f92fcb5)

author	Jakub Kicinski <kuba@kernel.org>
	Wed, 23 Mar 2022 17:52:56 +0000 (10:52 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Wed, 23 Mar 2022 17:53:49 +0000 (10:53 -0700)
commit	89695196f0ba78a17453f9616355f2ca6b293402
tree	7a0f44d06e5b83002899667841baa9a3598bf819	tree
parent	764f4eb6846f5475f1244767d24d25dd86528a4a	commit \| diff
parent	f92fcb5c00dc924a4661d5bf68de7937040f26b8	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Merge in overtime fixes, no conflicts.

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

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_idc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_ip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_core.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history

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