Merge: Upgrade the CAN bus core to v6.9
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6603 JIRA: https://issues.redhat.com/browse/RHEL-84144 Omitted-fix: 79f7319908fb ("can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it") Incorrectly identified as a fix by the KWF bot. This commit just mentions 3f9c26210cf8 ("can: error: add definitions for the different CAN error thresholds") in the description but it's NOT a fix for it. The scope of this upgrade is the CAN bus core (essentially net/can/), and it does not include the CAN bus interface drivers (drivers/net/can/). Signed-off-by:Radu Rendec <rrendec@redhat.com> Approved-by:
Jared Kangas <jkangas@redhat.com> Approved-by:
Aaron Brookner <abrookne@redhat.com> Approved-by:
Davide Caratti <dcaratti@redhat.com> Approved-by:
CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by:
Augusto Caringi <acaringi@redhat.com>
No related branches found
No related tags found
Showing
- Documentation/networking/can.rst 52 additions, 17 deletionsDocumentation/networking/can.rst
- drivers/net/can/dev/dev.c 22 additions, 0 deletionsdrivers/net/can/dev/dev.c
- drivers/net/can/dev/length.c 2 additions, 13 deletionsdrivers/net/can/dev/length.c
- drivers/net/can/dev/rx-offload.c 31 additions, 5 deletionsdrivers/net/can/dev/rx-offload.c
- drivers/net/can/flexcan/flexcan-core.c 2 additions, 2 deletionsdrivers/net/can/flexcan/flexcan-core.c
- drivers/net/can/m_can/m_can.c 4 additions, 4 deletionsdrivers/net/can/m_can/m_can.c
- drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c 3 additions, 3 deletionsdrivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c
- drivers/net/can/ti_hecc.c 2 additions, 2 deletionsdrivers/net/can/ti_hecc.c
- include/linux/can/bittiming.h 1 addition, 1 deletioninclude/linux/can/bittiming.h
- include/linux/can/dev.h 4 additions, 0 deletionsinclude/linux/can/dev.h
- include/linux/can/length.h 217 additions, 85 deletionsinclude/linux/can/length.h
- include/linux/can/platform/sja1000.h 1 addition, 1 deletioninclude/linux/can/platform/sja1000.h
- include/linux/can/rx-offload.h 7 additions, 4 deletionsinclude/linux/can/rx-offload.h
- include/uapi/linux/can.h 7 additions, 3 deletionsinclude/uapi/linux/can.h
- include/uapi/linux/can/error.h 17 additions, 1 deletioninclude/uapi/linux/can/error.h
- include/uapi/linux/can/isotp.h 1 addition, 0 deletionsinclude/uapi/linux/can/isotp.h
- include/uapi/linux/can/j1939.h 9 additions, 0 deletionsinclude/uapi/linux/can/j1939.h
- include/uapi/linux/can/raw.h 19 additions, 0 deletionsinclude/uapi/linux/can/raw.h
- net/can/af_can.c 4 additions, 3 deletionsnet/can/af_can.c
- net/can/bcm.c 101 additions, 29 deletionsnet/can/bcm.c
Loading
Please register or sign in to comment