linux_media

mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00

Files

Jakub Kicinski a7384f3918 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
  d7a2fc1437 ("selftests: net: fcnal-test: check if FIPS mode is enabled")
  dd017c72dd ("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>

2023-06-22 18:40:38 -07:00

fdp

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

2023-06-22 18:40:38 -07:00

microread

nfc: Switch i2c drivers back to use .probe()

2023-05-22 11:41:57 +01:00

nfcmrvl

nfc: Switch i2c drivers back to use .probe()

2023-05-22 11:41:57 +01:00

nxp-nci

nfc: nxp-nci: store __be16 value in __be16 variable