diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-12-03 11:14:41 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-03 11:14:41 -0800 |
| commit | 56e7a2f83d13306500ce807dd7ebbbb73b5a91d6 (patch) | |
| tree | 72da7230f8e7518dbd441f964571d3f765070c70 /net/bridge/br_device.c | |
| parent | Fixed updating of ethertype in function skb_mpls_pop (diff) | |
| parent | can: xilinx_can: Fix usage of skb memory (diff) | |
| download | linux-dev-56e7a2f83d13306500ce807dd7ebbbb73b5a91d6.tar.xz linux-dev-56e7a2f83d13306500ce807dd7ebbbb73b5a91d6.zip | |
Merge tag 'linux-can-fixes-for-5.5-20191203' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2019-12-03
this is a pull request of 6 patches for net/master.
The first two patches are against the MAINTAINERS file and adds Appana
Durga Kedareswara rao as maintainer for the xilinx-can driver and Sriram
Dash for the m_can (mmio) driver.
The next patch is by Jouni Hogander and fixes a use-after-free in the
slcan driver.
Johan Hovold's patch for the ucan driver fixes the non-atomic allocation
in the completion handler.
The last two patches target the xilinx-can driver. The first one is by
Venkatesh Yadav Abbarapu and skips the error message on deferred probe,
the second one is by Srinivas Neeli and fixes the usage of the skb after
can_put_echo_skb().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
0 files changed, 0 insertions, 0 deletions