]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ccf23c9 d8ec198)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 31 May 2024 21:09:20 +0000 (14:09 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 31 May 2024 21:10:28 +0000 (14:10 -0700)
commite19de2064fdf6f1f2488e36cf3927c3f1d01803c
tree3af14944616afdc409c97e012fb3d82cd1fa78fftree | snapshot
parentccf23c916ca35239a924ec8649cc88b1ef25d3d9commit | diff
parentd8ec19857b095b39d114ae299713bd8ea6c1e66acommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_classifier.c
  abd5576b9c57 ("net: ti: icssg-prueth: Add support for ICSSG switch firmware")
  56a5cf538c3f ("net: ti: icssg-prueth: Fix start counter for ft1 filter")
https://lore.kernel.org/all/20240531123822.3bb7eadf@canb.auug.org.au/

No other adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
arch/riscv/Kconfig diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.