diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-03-29 13:31:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-29 13:31:18 -0700 |
| commit | f4c848db16bed96734d8074d60047226978276ee (patch) | |
| tree | e7a3e203bfc1c240b806df9b239ed97cd39dc548 /net/dsa/dsa2.c | |
| parent | Merge branch 'mlxsw-ecn-marking' (diff) | |
| parent | can: uapi: can.h: mark union inside struct can_frame packed (diff) | |
| download | wireguard-linux-f4c848db16bed96734d8074d60047226978276ee.tar.xz wireguard-linux-f4c848db16bed96734d8074d60047226978276ee.zip | |
Merge tag 'linux-can-fixes-for-5.12-20210329' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2021-03-29
this is a pull request of 3 patches for net/master.
The two patch are by Oliver Hartkopp. He fixes length check in the
proto_ops::getname callback for the CAN RAW, BCM and ISOTP protocols,
which were broken by the introduction of the J1939 protocol.
The last patch is by me and fixes the a BUILD_BUG_ON() check which
triggers on ARCH=arm with CONFIG_AEABI unset.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions