projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c2e5f4f 0e8860d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 18 Aug 2023 19:44:22 +0000 (12:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 18 Aug 2023 19:44:56 +0000 (12:44 -0700)
commit7ff57803d24e0cb326251489d70f60462e3e6c04
tree4ff813109291e5d2c7745619d490af3cce481674tree | snapshot
parentc2e5f4fd1148727801a63d938cec210f16b48864commit | diff
parent0e8860d2125f51ba9bca67a520d826cb8f66cf42commit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e194997 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e88ada ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
22 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_nvm.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_eswitch.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ef100_nic.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/tc.c diff1 | diff2 | blob | history
drivers/net/pcs/pcs-rzn1-miic.c diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/veth.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
drivers/vdpa/mlx5/net/mlx5_vnet.c diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/tcp_timer.c diff1 | diff2 | blob | history
net/key/af_key.c diff1 | diff2 | blob | history
net/openvswitch/datapath.c diff1 | diff2 | blob | history
net/sunrpc/svcsock.c diff1 | diff2 | blob | history
Domain: System / Kernel;