github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-14 16:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
v7.3-rc1
linux/drivers/nfc
History
Jakub Kicinski 61eb236c41 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Merge in late fixes in preparation for the net-next PR.

Conflicts:

drivers/dpll/dpll_core.c
drivers/dpll/dpll_netlink.c
  33f016b23a ("dpll: fix NULL deref in dpll_device_ops() during teardown race")
  b1d0c41208 ("dpll: add STATE_CONNECTED_OVERRIDE pin capability")
https://lore.kernel.org/aoR9YYY2P5--3x0N@sirena.org.uk
https://lore.kernel.org/aoR9VmKllVGwmQn_@sirena.org.uk

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-08-18 10:42:41 -07:00
..
fdp Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-08-18 10:42:41 -07:00
microread Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-08-18 10:42:41 -07:00
nfcmrvl nfc: Unify style of usb_device_id arrays 2026-08-11 18:14:01 +02:00
nxp-nci nfc: Unify style of of_device_id arrays 2026-08-11 18:14:00 +02:00
pn533 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-08-18 10:42:41 -07:00
pn544 nfc: Unify style of of_device_id arrays 2026-08-11 18:14:00 +02:00
s3fwrn5 nfc: Unify style of of_device_id arrays 2026-08-11 18:14:00 +02:00
st-nci nfc: Unify style of spi_device_id arrays 2026-08-11 18:14:00 +02:00
st21nfca Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-08-18 10:42:41 -07:00
st95hf nfc: st95hf: switch to using sleeping variants of gpiod API 2026-08-11 18:14:01 +02: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 Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
mei_phy.h NFC: mei_phy: fix kernel-doc warnings 2025-11-17 19:32:32 -08:00
nfcsim.c Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00
port100.c nfc: Unify style of usb_device_id arrays 2026-08-11 18:14:01 +02:00
trf7970a.c nfc: Unify style of spi_device_id arrays 2026-08-11 18:14:00 +02:00
virtual_ncidev.c Convert 'alloc_obj' family to use the new default GFP_KERNEL argument 2026-02-21 17:09:51 -08:00