]> www.infradead.org Git - nvme.git/commit
projects / nvme.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: af58de3 0a1868b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Mon, 15 Jul 2024 20:05:05 +0000 (13:05 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 15 Jul 2024 20:19:17 +0000 (13:19 -0700)
commit51b35d4f9d8860b7c181e545a90bc0ad370efbdb
treeacde6b56b9ab31e4c8317d3013ca16403b6b9256tree
parentaf58de31bebe737235f0238843f2054996998bd5commit | diff
parent0a1868b93fad5938dbcca77286b25bf211c49f7acommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Merge in late fixes to prepare for the 6.11 net-next PR.

Conflicts:
  93c3a96c301f ("net: pse-pd: Do not return EOPNOSUPP if config is null")
  4cddb0f15ea9 ("net: ethtool: pse-pd: Fix possible null-deref")
  30d7b6727724 ("net: ethtool: Add new power limit get and set features")
https://lore.kernel.org/20240715123204.623520bb@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
15 files changed:
drivers/net/netconsole.c diff1 | diff2 | blob | history
drivers/net/pse-pd/pse_core.c diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
net/ethtool/pse-pd.c diff1 | diff2 | blob | history
net/ipv4/esp4.c diff1 | diff2 | blob | history
net/ipv4/esp4_offload.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/xfrm/xfrm_input.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
net/xfrm/xfrm_user.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.