diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-09 09:27:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-09 09:27:47 -0800 |
| commit | 43aad8104bdaa7176a8f87143ac0e559bc891293 (patch) | |
| tree | fdd1b1ccadfdfa93367f7037064da1741813151a /net/lapb/lapb_in.c | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
| parent | da2311a6385c3b499da2ed5d9be59ce331fa93e9 (diff) | |
Merge tag 'linux-can-fixes-for-5.5-20191208' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2019-12-08
this is a pull request of 13 patches for net/master.
The first two patches are by Dan Murphy. He adds himself as a maintainer to the
m-can MMIO and tcan SPI driver.
The next two patches the j1939 stack. The first one is by Oleksij Rempel and
fixes a locking problem found by the syzbot, the second one is by me an fixes a
mistake in the documentation.
Srinivas Neeli fixes missing RX CAN packets on CANFD2.0 in the xilinx driver.
Sean Nyekjaer fixes a possible deadlock in the the flexcan driver after
suspend/resume. Joakim Zhang contributes two patches for the flexcan driver
that fix problems with the low power enter/exit.
The next 4 patches all target the tcan part of the m_can driver. Sean Nyekjaer
adds the required delay after reset and fixes the device tree binding example.
Dan Murphy's patches make the wake-gpio optional.
In the last patch Xiaolong Huang fixes several kernel memory info leaks to the
USB device in the kvaser_usb_leaf driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions