acrn-kernel/drivers/nfc
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
nfcmrvl
nxp-nci nfc: nxp-nci: store __be16 value in __be16 variable 2023-06-12 09:40:31 +01:00
pn533
pn544
s3fwrn5
st-nci
st21nfca
st95hf
Kconfig
Makefile
mei_phy.c
mei_phy.h
nfcsim.c
port100.c
trf7970a.c
virtual_ncidev.c