git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 628bc3e 8c3b756)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 9 May 2024 16:59:29 +0000 (09:59 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 9 May 2024 17:01:01 +0000 (10:01 -0700)
commite7073830cc8b52ef3df7dd150e4dac7706e0e104
treee257cb163ac414e82acf319ab8cdd98ad4434036tree
parent628bc3e5a1beae395b5b515998396c60559ed3a9commit | diff
parent8c3b7565f81e030ef448378acd1b35dabb493e3bcommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
  35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
  2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
26 files changed:
Documentation/netlink/specs/rt_link.yaml diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hnae3.h diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/linux/slab.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
include/uapi/linux/xfrm.h diff1 | diff2 | blob | history
kernel/trace/trace_probe.c diff1 | diff2 | blob | history
net/core/net_namespace.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/hsr/hsr_device.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv4/xfrm4_input.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/xfrm6_input.c diff1 | diff2 | blob | history
net/mptcp/ctrl.c diff1 | diff2 | blob | history
net/phonet/pn_netlink.c diff1 | diff2 | blob | history
net/xfrm/xfrm_input.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.