linux.git/drivers/nfc, branch v5.15-rc2 Linux kernel source tree nfc: st95hf: remove unused header includes 2021-08-26T08:13:36+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-08-25T14:24:59+00:00 7fe2f1bc15be08779246f1d46efbaec8b141c9b7 Do not include unnecessary headers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Do not include unnecessary headers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
nfc: st21nfca: remove unused header includes 2021-08-26T08:13:36+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-08-25T14:24:58+00:00 994a63434133fdfcf1faea7d9daf3451afdff237 Do not include unnecessary headers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Do not include unnecessary headers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
nfc: st-nci: remove unused header includes 2021-08-26T08:13:36+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-08-25T14:24:57+00:00 2603ca8720409667e2250f370ea2827c073336df Do not include unnecessary headers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Do not include unnecessary headers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
nfc: pn544: remove unused header includes 2021-08-26T08:13:36+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-08-25T14:24:56+00:00 9b3f66bc0eca844bf269befdd620ecf527170e20 Do not include unnecessary headers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Do not include unnecessary headers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
nfc: mrvl: remove unused header includes 2021-08-26T08:13:35+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-08-25T14:24:55+00:00 d8eb4eb0ef1da9f6792cd749378be425278ba973 Do not include unnecessary headers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Do not include unnecessary headers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
nfc: microread: remove unused header includes 2021-08-26T08:13:35+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-08-25T14:24:54+00:00 ffb239e29518578c45f278fccd32db958ff59174 Do not include unnecessary headers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Do not include unnecessary headers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
nfc: virtual_ncidev: Use wait queue instead of polling 2021-08-18T09:17:57+00:00 Bongsu Jeon bongsu.jeon@samsung.com 2021-08-17T13:28:11+00:00 8675569d73cab15e5127d1f228afd3317cbeb5bf In previous version, the user level virtual device application that used this driver should have the polling scheme to read a NCI frame. To remove this polling scheme, use Wait Queue. Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
In previous version, the user level virtual device application that used
this driver should have the polling scheme to read a NCI frame.
To remove this polling scheme, use Wait Queue.

Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-07-31T16:14:46+00:00 Jakub Kicinski kuba@kernel.org 2021-07-31T16:14:46+00:00 d2e11fd2b7fcd10b7bcef418c55490c934aa94e8 Conflicting commits, all resolutions pretty trivial: drivers/bus/mhi/pci_generic.c 5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU") 56f6f4c4eb2a ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean") drivers/nfc/s3fwrn5/firmware.c a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label") 46573e3ab08f ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") 801e541c79bb ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") MAINTAINERS 7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver") 8a7b46fa7902 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org> 
Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4eb2a ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label")
  46573e3ab08f ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c79bb ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa7902 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
nfc: constify local pointer variables 2021-07-30T15:22:52+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-07-30T14:42:00+00:00 f2479c0a22948c5998938fa5bb9d98f9931791b7 Few pointers to struct nfc_target and struct nfc_se can be made const. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> 
Few pointers to struct nfc_target and struct nfc_se can be made const.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
nfc: mrvl: correct nfcmrvl_spi_parse_dt() device_node argument 2021-07-30T15:22:51+00:00 Krzysztof Kozlowski krzysztof.kozlowski@canonical.com 2021-07-30T14:41:56+00:00 3833b87408e5722e0b43b9b73f58d17db47a4c98 The device_node in nfcmrvl_spi_parse_dt() cannot be const as it is passed to OF functions which modify it. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> 
The device_node in nfcmrvl_spi_parse_dt() cannot be const as it is
passed to OF functions which modify it.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>