Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 08:31:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
5461fc0c8d
linux/drivers/nfc
History
Jakub Kicinski 44a8c4f33c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-09-04 21:28:59 -07:00
..
fdp treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
microread treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
nfcmrvl nfc: Fix Kconfig indentation 2019-11-20 12:30:40 -08:00
nxp-nci treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
pn533 treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
pn544 treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
s3fwrn5 nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frame 2020-07-20 18:31:33 -07:00
st21nfca Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
st95hf NFC: st95hf: Fix memleak in st95hf_in_send_cmd 2020-08-24 17:34:25 -07:00
st-nci nfc: st-nci: Remove unnecessary cast 2020-08-20 16:17:45 -07:00
Kconfig treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mei_phy.c nfc/mei: convert to SPDX license tags 2019-03-28 02:07:54 +09:00
mei_phy.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
nfcsim.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 288 2019-06-05 17:36:37 +02:00
port100.c NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). 2019-12-09 14:27:26 -08:00
trf7970a.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00