diff options
| author | Jakub Kicinski <[email protected]> | 2025-07-26 18:44:23 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-07-26 18:49:45 +0000 |
| commit | c58c18be8850d58fd61b0480d2355df89ce7ee59 (patch) | |
| tree | d0ef58fab37674a1b56fc0df0400898e58b60fd5 /drivers/pwm/pwm-atmel.c | |
| parent | net/sched: taprio: align entry index attr validation with mqprio (diff) | |
| parent | Merge branch 'ipv6-f6i-fib6_siblings-and-rt-fib6_nsiblings-fixes' (diff) | |
| download | kernel-c58c18be8850d58fd61b0480d2355df89ce7ee59.tar.gz kernel-c58c18be8850d58fd61b0480d2355df89ce7ee59.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.17 net-next PR.
Conflicts:
net/core/neighbour.c
1bbb76a89948 ("neighbour: Fix null-ptr-deref in neigh_flush_dev().")
13a936bb99fb ("neighbour: Protect tbl->phash_buckets[] with a dedicated mutex.")
03dc03fa0432 ("neighbor: Add NTF_EXT_VALIDATED flag for externally validated entries")
Adjacent changes:
drivers/net/usb/usbnet.c
0d9cfc9b8cb1 ("net: usbnet: Avoid potential RCU stall on LINK_CHANGE event")
2c04d279e857 ("net: usb: Convert tasklet API to new bottom half workqueue mechanism")
net/ipv6/route.c
31d7d67ba127 ("ipv6: annotate data-races around rt->fib6_nsiblings")
1caf27297215 ("ipv6: adopt dst_dev() helper")
3b3ccf9ed05e ("net: Remove unnecessary NULL check for lwtunnel_fill_encap()")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/pwm/pwm-atmel.c')
0 files changed, 0 insertions, 0 deletions