diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-12 09:53:08 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-12 09:53:08 -0700 |
| commit | 2ad119d998e49003327b81edb7b854d0983b5d58 (patch) | |
| tree | dc3bc0dce080d44536566ad7ee0984a1fad496fa /include/uapi/linux | |
| parent | 15f5e48f93c0e028b4d5cc0e8ede1168a2308fe6 (diff) | |
| parent | f726f3d37163f714034aa5fd1f92a1a73df4297f (diff) | |
Merge tag 'linux-can-next-for-5.10-20201012' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
linux-can-next-for-5.10-20201012
Both patches are by Oliver Hartkopp, the first one addresses Jakub's review
comments of the ISOTP protocol, the other one removes version strings from
various CAN protocols.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/can/isotp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/can/isotp.h b/include/uapi/linux/can/isotp.h index 553006509f4e..7793b26aa154 100644 --- a/include/uapi/linux/can/isotp.h +++ b/include/uapi/linux/can/isotp.h @@ -160,7 +160,6 @@ struct can_isotp_ll_options { * these default settings can be changed via sockopts. * For that reason the STmin value is intentionally _not_ checked for * consistency and copied directly into the flow control (FC) frame. - * */ #endif /* !_UAPI_CAN_ISOTP_H */ |