diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-02-02 11:51:24 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-02 11:51:24 -0800 |
| commit | b0de13d3070bb1daab6e0d9410309fa5fa9d6295 (patch) | |
| tree | 60aaab783ece7ef0d5ff1369fba37f7470f3b5a2 /drivers/nvmem | |
| parent | 4b6e135e6bee02e29d27911ba0b9a045c9e489e8 (diff) | |
| parent | 1613fff7a32e1d9e2ac09db73feba0e71a188445 (diff) | |
| download | linux-stable-b0de13d3070bb1daab6e0d9410309fa5fa9d6295.tar.gz linux-stable-b0de13d3070bb1daab6e0d9410309fa5fa9d6295.tar.bz2 linux-stable-b0de13d3070bb1daab6e0d9410309fa5fa9d6295.zip | |
Merge tag 'linux-can-fixes-for-6.2-20230202' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
can 2023-02-02
The first patch is by Ziyang Xuan and removes a errant WARN_ON_ONCE()
in the CAN J1939 protocol.
The next 3 patches are by Oliver Hartkopp. The first 2 target the CAN
ISO-TP protocol and fix the state machine with respect to signals and
a regression found by the syzbot.
The last patch is by me an missing assignment during the ethtool ring
configuration callback.
* tag 'linux-can-fixes-for-6.2-20230202' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
can: mcp251xfd: mcp251xfd_ring_set_ringparam(): assign missing tx_obj_num_coalesce_irq
can: isotp: split tx timer into transmission and timeout
can: isotp: handle wait_event_interruptible() return values
can: raw: fix CAN FD frame transmissions over CAN XL devices
can: j1939: fix errant WARN_ON_ONCE in j1939_session_deactivate
====================
Link: https://lore.kernel.org/r/20230202094135.2293939-1-mkl@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/nvmem')
0 files changed, 0 insertions, 0 deletions