linux-stable/drivers/nfc
Jakub Kicinski 7df621a3ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
  7b50ecfcc6 ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0db ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d033 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1f6 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-28 10:43:58 -07:00
..
fdp nfc: fdp: drop unneeded debug prints 2021-09-13 14:38:00 +01:00
microread nfc: microread: drop unneeded debug prints 2021-10-11 17:00:52 -07:00
nfcmrvl nfc: mrvl: drop unneeded memory allocation fail messages 2021-09-13 14:38:32 +01:00
nxp-nci nfc: constify nci_ops 2021-07-25 09:21:20 +01:00
pn533 nfc: pn533: Constify pn533_phy_ops 2021-10-07 13:35:10 +01:00
pn544 nfc: pn544: drop unneeded memory allocation fail messages 2021-09-13 14:38:01 +01:00
s3fwrn5 nfc: s3fwrn5: simplify dereferencing pointer to struct device 2021-10-11 17:00:51 -07:00
st-nci nfc: st-nci: drop unneeded debug prints 2021-10-11 17:00:51 -07:00
st21nfca nfc: st21nfca: drop unneeded debug prints 2021-10-11 17:00:51 -07:00
st95hf nfc: st95hf: Make spi remove() callback return zero 2021-10-20 14:41:20 +01: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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-07-31 09:14:46 -07:00
port100.c nfc: port100: fix using -ERRNO as command type mask 2021-10-26 13:42:00 +01:00
trf7970a.c nfc: trf7970a: drop unneeded debug prints 2021-10-11 17:00:52 -07:00
virtual_ncidev.c nfc: virtual_ncidev: Use wait queue instead of polling 2021-08-18 10:17:57 +01:00