diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-09 21:41:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-09 21:41:57 +0200 |
| commit | f6d4c7133257bb2d6f66723d11b19f1c49cdf2f7 (patch) | |
| tree | 02e37b991d8ec35b970d17352ec683bfde10b85d /drivers/crypto/atmel-tdes-regs.h | |
| parent | mac80211: free netdev on dev_alloc_name() error (diff) | |
| parent | can: enable CAN FD for virtual CAN devices by default (diff) | |
| download | linux-f6d4c7133257bb2d6f66723d11b19f1c49cdf2f7.tar.xz linux-f6d4c7133257bb2d6f66723d11b19f1c49cdf2f7.zip | |
Merge tag 'linux-can-fixes-for-4.12-20170609' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2017-06-09
this is a pull request of 6 patches for net/master.
There's a patch by Stephane Grosjean that fixes an uninitialized symbol warning
in the peak_canfd driver. A patch by Johan Hovold to fix the product-id
endianness in an error message in the the peak_usb driver. A patch by Oliver
Hartkopp to enable CAN FD for virtual CAN devices by default. Three patches by
me, one makes the helper function can_change_state() robust to be called with
cf == NULL. The next patch fixes a memory leak in the gs_usb driver. And the
last one fixes a lockdep splat by properly initialize the per-net
can_rcvlists_lock spin_lock.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/crypto/atmel-tdes-regs.h')
0 files changed, 0 insertions, 0 deletions