| commit | a7384f3918756c193e3fcd7e3111fc4bd3686013 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Thu Jun 22 18:40:38 2023 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Thu Jun 22 18:40:38 2023 -0700 |
| tree | 156fda862edf0154225e6a5d8d092b0f6fe35728 | |
| parent | 98e95872f2b818c74872d073eaa4c937579d41fc [diff] | |
| parent | 8a28a0b6f1a1dcbf5a834600a9acfbe2ba51e5eb [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
tools/testing/selftests/net/fcnal-test.sh
d7a2fc1437f7 ("selftests: net: fcnal-test: check if FIPS mode is enabled")
dd017c72dde6 ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.")
https://lore.kernel.org/all/5007b52c-dd16-dbf6-8d64-b9701bfa498b@tessares.net/
https://lore.kernel.org/all/20230619105427.4a0df9b3@canb.auug.org.au/
No adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>