summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-07-24 19:33:23 +0100
committerDavid S. Miller <davem@davemloft.net>2021-07-24 19:33:23 +0100
commite394f1e3b13946b200935310ebdd5583cf374bba (patch)
tree8a701cbb221058e6f063c65fda661000f99b51cf /net/tipc
parent5aa1959d18003472cc741dc490c3335c5bd804e2 (diff)
parentef68a717960658e6a1e5f08adb0574326e9a12c2 (diff)
downloadlinux-e394f1e3b13946b200935310ebdd5583cf374bba.tar.gz
linux-e394f1e3b13946b200935310ebdd5583cf374bba.tar.bz2
linux-e394f1e3b13946b200935310ebdd5583cf374bba.zip
Merge tag 'linux-can-fixes-for-5.14-20210724' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
linux-can-fixes-for-5.14-20210724 Marc Kleine-Budde says: ==================== pull-request: can 2021-07-24 this is a pull request of 6 patches for net/master. The first patch is by Joakim Zhang targets the imx8mp device tree. It removes the imx6 fallback from the flexcan binding, as the imx6 is not compatible with the imx8mp. Ziyang Xuan contributes a patch to fix a use-after-free in the CAN raw's raw_setsockopt(). The next two patches target the CAN J1939 protocol. The first one is by Oleksij Rempel and clarifies the lifetime of session object in j1939_session_deactivate(). Zhang Changzhong's patch fixes the timeout value between consecutive TP.DT. Stephane Grosjean contributes a patch for the peak_usb driver to fix reading of the rxerr/txerr values. The last patch is by me for the mcp251xfd driver. It stops the timestamp worker in case of a fatal error in the IRQ handler. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions