Greg Kroah-Hartman 0f8b29faba Merge 5.11-rc5 into tty-next ...

We need the fixes in here and this resolves a merge issue in
drivers/tty/tty_io.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2021-01-25 11:19:46 +01:00

..

hci

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

nci

Merge 5.11-rc5 into tty-next

2021-01-25 11:19:46 +01:00

af_nfc.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13

2019-05-21 11:28:45 +02:00

core.c

net: nfc: Fix kerneldoc warnings

2020-10-30 11:57:56 -07:00

digital_core.c

net: nfc: Fix kerneldoc warnings

2020-10-30 11:57:56 -07:00

digital_dep.c

NFC: digital: Remove two unused macroes

2020-09-05 16:01:52 -07:00

digital_technology.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 288

2019-06-05 17:36:37 +02:00

digital.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 288

2019-06-05 17:36:37 +02:00

Kconfig

net: sched: fix spelling mistake in Kconfig "trys" -> "tries"

2020-12-08 16:01:56 -08:00

llcp_commands.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13

2019-05-21 11:28:45 +02:00

llcp_core.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13

2019-05-21 11:28:45 +02:00

llcp_sock.c

net: pass a sockptr_t into ->setsockopt

2020-07-24 15:41:54 -07:00

llcp.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13

2019-05-21 11:28:45 +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

netlink.c

treewide: rename nla_strlcpy to nla_strscpy.

2020-11-16 08:08:54 -08:00

nfc.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13

2019-05-21 11:28:45 +02:00

rawsock.c

net/nfc/rawsock.c: add CAP_NET_RAW check.

2020-08-11 10:34:30 -07:00