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: 9d797ee 25a9c8a)

author	Jakub Kicinski <kuba@kernel.org>
	Tue, 27 Jun 2023 16:45:22 +0000 (09:45 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Tue, 27 Jun 2023 16:45:22 +0000 (09:45 -0700)
commit	3674fbf0451df0395f9fa18df3122927006a3829
tree	632690d6c74a7bedb166299bbc92059cd3a537f9	tree
parent	9d797ee2dce1e3e243bcc18dad7728df72fd11a4	commit \| diff
parent	25a9c8a4431c364f97f75558cb346d2ad3f53fbb	commit \| diff

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

Merge in late fixes to prepare for the 6.5 net-next PR.

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

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ipvlan/ipvlan_core.c	diff1 \|	diff2 \|	blob \| history
include/net/dsa.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/can/isotp.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/nfc/llcp_commands.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history

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