admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Cross-merge networking fixes after downstream PR (net-6.15-rc2).

Conflict:

Documentation/networking/netdevices.rst
net/core/lock_debug.c
  04efcee6ef ("net: hold instance lock during NETDEV_CHANGE")
  03df156dd3 ("xdp: double protect netdev->xdp_flags with netdev->lock")

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-04-10 16:49:17 -07:00
parent a9843689e2 ab59a86056
commit cb7103298d
1308 changed files with 9005 additions and 5635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/lock_debug.c
View File

@@ -18,6 +18,7 @@ int netdev_debug_event(struct notifier_block *nb, unsigned long event,
/* Keep enum and don't add default to trigger -Werror=switch */
switch (cmd) {
case NETDEV_CHANGE:
case NETDEV_REGISTER:
case NETDEV_UP:
case NETDEV_XDP_FEAT_CHANGE:
@@ -25,7 +26,6 @@ int netdev_debug_event(struct notifier_block *nb, unsigned long event,
fallthrough;
case NETDEV_DOWN:
case NETDEV_REBOOT:
case NETDEV_CHANGE:
case NETDEV_UNREGISTER:
case NETDEV_CHANGEMTU:
case NETDEV_CHANGEADDR: