Gentwo Git Trees - linux/.git/commit

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

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 12 Jun 2025 17:08:24 +0000 (10:08 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 4 Sep 2025 20:33:00 +0000 (13:33 -0700)
commit	5ef04a7b068cbb828eba226aacb42f880f7924d7
tree	92595a2d68b1a4b41e4762e62c0b58e4467d0a83	tree \| snapshot
parent	c975e1dfcc929dbfde8abfa514494b66f0335006	commit \| diff
parent	d69eb204c255c35abd9e8cb621484e8074c75eaa	commit \| diff

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

Cross-merge networking fixes after downstream PR (net-6.17-rc5).

No conflicts.

Adjacent changes:

include/net/sock.h
c51613fa276f ("net: add sk->sk_drop_counters")
5d6b58c932ec ("net: lockless sock_i_ino()")

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

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microchip/lan865x/lan865x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_ib.c	diff1 \|	diff2 \|	blob \| history
tools/net/ynl/pyynl/ynl_gen_c.py	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history

Development tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microchip/lan865x/lan865x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_ib.c	diff1 \|	diff2 \|	blob \| history
tools/net/ynl/pyynl/ynl_gen_c.py	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history