mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity
linux-stable/drivers/nfc
History
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 2023-06-12 09:40:31 +01:00
pn533 nfc: Switch i2c drivers back to use .probe() 2023-05-22 11:41:57 +01:00
pn544 nfc: Switch i2c drivers back to use .probe() 2023-05-22 11:41:57 +01:00
s3fwrn5 nfc: Switch i2c drivers back to use .probe() 2023-05-22 11:41:57 +01:00
st-nci nfc: Switch i2c drivers back to use .probe() 2023-05-22 11:41:57 +01:00
st21nfca nfc: Switch i2c drivers back to use .probe() 2023-05-22 11:41:57 +01:00
st95hf spi: make remove callback a void function 2022-02-09 13:00:45 +00:00
Kconfig nfc: Add a virtual nci device driver 2021-01-29 18:03:33 -08:00
Makefile nfc: Add a virtual nci device driver 2021-01-29 18:03:33 -08:00
mei_phy.c nfc: mei_phy: constify buffer passed to mei_nfc_send() 2021-07-29 12:28:02 +01:00
mei_phy.h nfc: constify nfc_phy_ops 2021-07-25 09:21:21 +01:00
nfcsim.c nfcsim.c: Fix error checking for debugfs_create_dir 2023-05-26 12:18:35 +01:00
port100.c NFC: port100: fix use-after-free in port100_send_complete 2022-03-09 19:59:34 -08:00
trf7970a.c nfc: trf7970a: mark OF related data as maybe unused 2023-03-15 08:03:54 +00:00
virtual_ncidev.c NFC: nci: Allow to create multiple virtual nci devices 2022-11-17 13:48:01 +01:00