From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 8 May 2025 15:56:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.16-rc1~132^2~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b02fd7799fc8e1160c5783459d065ceeb4b7365;p=thirdparty%2Flinux.git

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

Cross-merge networking fixes after downstream PR (net-6.15-rc6).

No conflicts.

Adjacent changes:

net/core/dev.c:
  08e9f2d584c4 ("net: Lock netdevices during dev_shutdown")
  a82dc19db136 ("net: avoid potential race between netdev_get_by_index_lock() and netns switch")

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

6b02fd7799fc8e1160c5783459d065ceeb4b7365