From ffd60c9b74117361fe3dfd1004533ff593b90645 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 12 Nov 2019 08:59:26 +0100 Subject: [PATCH] include: import header files from kernel v5.4-rc7 Signed-off-by: Yegor Yefremov --- include/linux/can.h | 2 +- include/linux/can/bcm.h | 2 +- include/linux/can/error.h | 2 +- include/linux/can/gw.h | 2 +- include/linux/can/j1939.h | 2 +- include/linux/can/netlink.h | 8 ++++---- include/linux/can/raw.h | 2 +- include/linux/can/vxcan.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/can.h b/include/linux/can.h index 4e46a7e..4a6df74 100644 --- a/include/linux/can.h +++ b/include/linux/can.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * linux/can.h * diff --git a/include/linux/can/bcm.h b/include/linux/can/bcm.h index 0fb328d..dd2b925 100644 --- a/include/linux/can/bcm.h +++ b/include/linux/can/bcm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * linux/can/bcm.h * diff --git a/include/linux/can/error.h b/include/linux/can/error.h index bfc4b5d..3463328 100644 --- a/include/linux/can/error.h +++ b/include/linux/can/error.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * linux/can/error.h * diff --git a/include/linux/can/gw.h b/include/linux/can/gw.h index 3aea538..c2190bb 100644 --- a/include/linux/can/gw.h +++ b/include/linux/can/gw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * linux/can/gw.h * diff --git a/include/linux/can/j1939.h b/include/linux/can/j1939.h index c323253..df6e821 100644 --- a/include/linux/can/j1939.h +++ b/include/linux/can/j1939.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * j1939.h * diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h index 9f56fad..6f598b7 100644 --- a/include/linux/can/netlink.h +++ b/include/linux/can/netlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* * linux/can/netlink.h * @@ -40,15 +40,15 @@ struct can_bittiming { }; /* - * CAN harware-dependent bit-timing constant + * CAN hardware-dependent bit-timing constant * * Used for calculating and checking bit-timing parameters */ struct can_bittiming_const { char name[16]; /* Name of the CAN controller hardware */ - __u32 tseg1_min; /* Time segement 1 = prop_seg + phase_seg1 */ + __u32 tseg1_min; /* Time segment 1 = prop_seg + phase_seg1 */ __u32 tseg1_max; - __u32 tseg2_min; /* Time segement 2 = phase_seg2 */ + __u32 tseg2_min; /* Time segment 2 = phase_seg2 */ __u32 tseg2_max; __u32 sjw_max; /* Synchronisation jump width */ __u32 brp_min; /* Bit-rate prescaler */ diff --git a/include/linux/can/raw.h b/include/linux/can/raw.h index be3b36e..6a11d30 100644 --- a/include/linux/can/raw.h +++ b/include/linux/can/raw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * linux/can/raw.h * diff --git a/include/linux/can/vxcan.h b/include/linux/can/vxcan.h index 066812d..4fa9d87 100644 --- a/include/linux/can/vxcan.h +++ b/include/linux/can/vxcan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ #ifndef _UAPI_CAN_VXCAN_H #define _UAPI_CAN_VXCAN_H