diff options
| author | 2022-04-20 11:14:36 +0100 | |
|---|---|---|
| committer | 2022-04-20 11:14:36 +0100 | |
| commit | 85ef87ba9bc282cef441f75d90e2f52f624221ef (patch) | |
| tree | 42093cfe9d3748476ed2b46efff9b85136277ecf /include/uapi | |
| parent | Merge branch 'net-sched-flower-num-vlan-tags' (diff) | |
| parent | MAINTAINERS: Add maintainers for CTU CAN FD IP core driver (diff) | |
| download | linux-dev-85ef87ba9bc282cef441f75d90e2f52f624221ef.tar.xz linux-dev-85ef87ba9bc282cef441f75d90e2f52f624221ef.zip | |
Merge tag 'linux-can-next-for-5.19-20220419' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2022-04-19
this is a pull request of 17 patches for net-next/master.
The first 2 patches are by me and target the CAN driver
infrastructure. One patch renames a function in the rx_offload helper
the other one updates the CAN bitrate calculation to prefer small bit
rate pre-scalers over larger ones, which is encouraged by the CAN in
Automation.
Kris Bahnsen contributes a patch to fix the links to Technologic
Systems web resources in the sja1000 driver.
Christophe Leroy's patch prepares the mpc5xxx_can driver for upcoming
powerpc header cleanup.
Minghao Chi's patch converts the flexcan driver to use
pm_runtime_resume_and_get().
The next 2 patches target the Xilinx CAN driver. Lukas Bulwahn's patch
fixes an entry in the MAINTAINERS file. A patch by me marks the bit
timing constants as const.
Wolfram Sang's patch documents r8a77961 support on the
renesas,rcar-canfd bindings document.
The next 2 patches are by me and add support for the mcp251863 chip to
the mcp251xfd driver.
The last 7 patches are by Pavel Pisa, Martin Jerabek et al. and add
the ctucanfd driver for the CTU CAN FD IP Core.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
0 files changed, 0 insertions, 0 deletions
