summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-10-01 01:21:43 +0300
committerDavid S. Miller <davem@davemloft.net>2020-10-01 01:21:43 +0300
commit8333c1c4ee61c873bdb5327dba858f58de2a98d8 (patch)
treef035b66fe492d5fe9128072d48dcc01e9a972f09 /include/trace
parent11789fe7761b4821314d8be341b01ffc775b37a4 (diff)
parent5a9323f55d52c9246ce85f2c9c6a8ec45413b1d0 (diff)
downloadlinux-8333c1c4ee61c873bdb5327dba858f58de2a98d8.tar.xz
Merge tag 'linux-can-next-for-5.10-20200930' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2020-09-30 this is a pull request of 13 patches for net-next. The first 10 target the mcp25xxfd driver (which is renamed to mcp251xfd during this series). The first two patches are by Thomas Kopp, which adds reference to the just related errata and updates the documentation and log messages. Dan Carpenter's patch fixes a resource leak during ifdown. A patch by me adds the missing initialization of a variable. Oleksij Rempel updates the DT binding documentation as requested by Rob Herring. The next 5 patches are by Thomas Kopp and me. During review Geert Uytterhoeven suggested to use "microchip,mcp251xfd" instead of "microchip,mcp25xxfd" as the DT autodetection compatible to avoid clashes with future but incompatible devices. We decided not only to rename the compatible but the whole driver from "mcp25xxfd" to "mcp251xfd". This is done in several patches. Joakim Zhang contributes three patches for the flexcan driver. The first one adds support for the ECC feature, which is implemented on some modern IP cores, by initializing the controller's memory during ifup. The next patch adds support for the i.MX8MP (which supports ECC) and the last patch properly disables the runtime PM if device registration fails. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions