summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-11-07 19:05:52 +0000
committerDavid S. Miller <davem@davemloft.net>2021-11-07 19:05:52 +0000
commitf05fb508ec3bb2d4b6006682d76d380d50a6fc42 (patch)
tree8d65c4ca75dd91f704853d8eb6ba1dc42a5d7904 /drivers/nfc
parent70bf363d7adb3a428773bc905011d0ff923ba747 (diff)
parent69c55f6e7669d46bb40e41f6e2b218428178368a (diff)
downloadlinux-f05fb508ec3bb2d4b6006682d76d380d50a6fc42.tar.bz2
Merge tag 'linux-can-fixes-for-5.16-20211106' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
linux-can-fixes-for-5.16-20211106 Marc Kleine-Budde says: ==================== pull-request: can 2021-11-06 this is a pull request of 8 patches for net/master. The first 3 patches are by Zhang Changzhong and fix 3 standard conformance problems in the j1939 CAN stack. The next patch is by Vincent Mailhol and fixes a memory leak in the leak error path of the etas_es58x CAN driver. Stephane Grosjean contributes 2 patches for the peak_usb driver to fix the bus error handling and update the order of printed information regarding firmware version and available updates. The last 2 patches are by me and fixes a packet starvation problem in the bus off case and the error handling in the mcp251xfd_chip_start() function. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions