Jakub Kicinski 2bd87951de Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_prueth.c

net/mac80211/chan.c
  89884459a0 ("wifi: mac80211: fix idle calculation with multi-link")
  87f5500285 ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()")
https://lore.kernel.org/all/20240422105623.7b1fbda2@canb.auug.org.au/

net/unix/garbage.c
  1971d13ffa ("af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().")
  4090fa373f ("af_unix: Replace garbage collection algorithm.")

drivers/net/ethernet/ti/icssg/icssg_prueth.c
drivers/net/ethernet/ti/icssg/icssg_common.c
  4dcd0e83ea ("net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()")
  e2dc7bfd67 ("net: ti: icssg-prueth: Move common functions into a separate file")

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-04-25 12:41:37 -07:00

..

fdp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-06-22 18:40:38 -07:00

microread

nfc: Switch i2c drivers back to use .probe()

2023-05-22 11:41:57 +01:00

nfcmrvl

nfc: mrvl: spi: drop driver owner assignment

2024-03-29 12:32:51 -07:00

nxp-nci

NFC: nxp: add NXP1002

2023-08-30 18:32:24 -07:00

pn533

treewide, serdev: change receive_buf() return type to size_t

2024-01-27 18:13:53 -08:00

pn544

nfc: Switch i2c drivers back to use .probe()

2023-05-22 11:41:57 +01:00

s3fwrn5

treewide, serdev: change receive_buf() return type to size_t

2024-01-27 18:13:53 -08:00

st21nfca

nfc: Switch i2c drivers back to use .probe()

2023-05-22 11:41:57 +01:00

st95hf

nfc: st95hf: drop driver owner assignment

2024-03-29 12:32:51 -07:00

st-nci

nfc: Switch i2c drivers back to use .probe()

2023-05-22 11:41:57 +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

nfcsim.c: Fix error checking for debugfs_create_dir

2023-05-26 12:18:35 +01:00

port100.c

NFC: port100: fix use-after-free in port100_send_complete

2022-03-09 19:59:34 -08:00

trf7970a.c

NFC: trf7970a: disable all regulators on removal

2024-04-22 14:19:58 -07:00

virtual_ncidev.c

nfc: virtual_ncidev: Add variable to check if ndev is running

2023-11-22 10:55:48 +00:00