git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ccb9bc1 399bd66)

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 23 Jun 2022 19:33:24 +0000 (12:33 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 23 Jun 2022 19:33:24 +0000 (12:33 -0700)
commit	93817be8b62c7fa1f1bdc3e8c037a73a60026be9
tree	873c207abc783edb4ead73b2b3a8a9b105f94420	tree \| snapshot
parent	ccb9bc1dfa444e3541622ccfff135e83d2a569d1	commit \| diff
parent	399bd66e219e331976fe6fa6ab81a023c0c97870	commit \| diff

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

No conflicts.

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

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/aquantia_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/smsc.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/skmsg.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_bpf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git