Gentwo Git Trees - linux/.git/commit

]> Gentwo Git Trees - linux/.git/commit

gentwo / linux / .git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e143c14 7183877)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 25 Feb 2025 00:27:39 +0000 (11:27 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 25 Feb 2025 00:27:39 +0000 (11:27 +1100)
commit	296201a1a6824dfc1a35445c0185f956cba7536a
tree	9cfdafd838f18f57ff0e41cf9d26c53a72473d3c	tree \| snapshot
parent	e143c14262af27e8d867e481d1955ba0c6477809	commit \| diff
parent	7183877d6853801258b7a8d3b51b415982e5097e	commit \| diff

Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

# Conflicts:
# drivers/net/ethernet/cadence/macb_main.c

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/irdma/main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microsoft/mana/gdma_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c	diff1 \|	diff2 \|	blob \| history
fs/eventpoll.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/common.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/ioctl.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history

Development tree.