mbox series

pull-request: can-next 2021-01-13

Message ID 20210113211410.917108-1-mkl@pengutronix.de (mailing list archive)
State Superseded
Headers show
Series pull-request: can-next 2021-01-13 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.12-20210113

Checks

Context Check Description
netdev/tree_selection success Series ignored based on subject

Message

Marc Kleine-Budde Jan. 13, 2021, 9:13 p.m. UTC
Hello Jakub, hello David,

this is a pull request of 17 patches for net-next/master.

The first two patches update the MAINTAINERS file, Lukas Bulwahn's patch fixes
the files entry for the tcan4x5x driver, which was broken by me in net-next.
A patch by me adds the a missing header file to the CAN Networking Layer.

The next 5 patches are by me and split the the CAN driver related
infrastructure code into more files in a separate subdir. The next two patches
by me clean up the CAN length related code. This is followed by 6 patches by
Vincent Mailhol and me, they add helper code for for CAN frame length
calculation neede for BQL support.

A patch by Vincent Mailhol adds software TX timestamp support.

The last patch is by me, targets the tcan4x5x driver, and removes the unneeded
__packed attribute from the struct tcan4x5x_map_buf.

regards,
Marc

---

The following changes since commit f50e2f9f791647aa4e5b19d0064f5cabf630bf6e:

  hci: llc_shdlc: style: Simplify bool comparison (2021-01-12 20:18:30 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.12-20210113

for you to fetch changes up to b42e45a913f2ae76807e656a1c053808d7d34352:

  can: tcan4x5x: remove __packed attribute from struct tcan4x5x_map_buf (2021-01-13 21:48:28 +0100)

----------------------------------------------------------------
linux-can-next-for-5.12-20210113

----------------------------------------------------------------
Lukas Bulwahn (1):
      MAINTAINERS: adjust entry to tcan4x5x file split

Marc Kleine-Budde (13):
      MAINTAINERS: CAN network layer: add missing header file can-ml.h
      can: dev: move driver related infrastructure into separate subdir
      can: dev: move bittiming related code into seperate file
      can: dev: move length related code into seperate file
      can: dev: move skb related into seperate file
      can: dev: move netlink related code into seperate file
      can: length: convert to kernel coding style
      can: length: can_fd_len2dlc(): simplify length calculcation
      can: length: canfd_sanitize_len(): add function to sanitize CAN-FD data length
      can: dev: extend struct can_skb_priv to hold CAN frame length
      can: dev: can_get_echo_skb(): extend to return can frame length
      can: dev: can_rx_offload_get_echo_skb(): extend to return can frame length
      can: tcan4x5x: remove __packed attribute from struct tcan4x5x_map_buf

Vincent Mailhol (3):
      can: length: can_skb_get_frame_len(): introduce function to get data length of frame in data link layer
      can: dev: can_put_echo_skb(): extend to handle frame_len
      can: dev: can_put_echo_skb(): add software tx timestamps

 MAINTAINERS                                       |    5 +-
 drivers/net/can/Makefile                          |    7 +-
 drivers/net/can/at91_can.c                        |    4 +-
 drivers/net/can/c_can/c_can.c                     |    4 +-
 drivers/net/can/cc770/cc770.c                     |    4 +-
 drivers/net/can/dev.c                             | 1338 ---------------------
 drivers/net/can/dev/Makefile                      |   11 +
 drivers/net/can/dev/bittiming.c                   |  261 ++++
 drivers/net/can/dev/dev.c                         |  467 +++++++
 drivers/net/can/dev/length.c                      |   90 ++
 drivers/net/can/dev/netlink.c                     |  379 ++++++
 drivers/net/can/{ => dev}/rx-offload.c            |    5 +-
 drivers/net/can/dev/skb.c                         |  231 ++++
 drivers/net/can/flexcan.c                         |    7 +-
 drivers/net/can/grcan.c                           |    4 +-
 drivers/net/can/ifi_canfd/ifi_canfd.c             |    4 +-
 drivers/net/can/kvaser_pciefd.c                   |    6 +-
 drivers/net/can/m_can/m_can.c                     |    8 +-
 drivers/net/can/m_can/tcan4x5x.h                  |    2 +-
 drivers/net/can/mscan/mscan.c                     |    4 +-
 drivers/net/can/pch_can.c                         |    4 +-
 drivers/net/can/peak_canfd/peak_canfd.c           |    4 +-
 drivers/net/can/rcar/rcar_can.c                   |    4 +-
 drivers/net/can/rcar/rcar_canfd.c                 |    4 +-
 drivers/net/can/sja1000/sja1000.c                 |    4 +-
 drivers/net/can/softing/softing_main.c            |    4 +-
 drivers/net/can/spi/hi311x.c                      |    4 +-
 drivers/net/can/spi/mcp251x.c                     |    4 +-
 drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c    |    4 +-
 drivers/net/can/sun4i_can.c                       |    4 +-
 drivers/net/can/ti_hecc.c                         |    4 +-
 drivers/net/can/usb/ems_usb.c                     |    4 +-
 drivers/net/can/usb/esd_usb2.c                    |    4 +-
 drivers/net/can/usb/gs_usb.c                      |    4 +-
 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c  |    2 +-
 drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c |    2 +-
 drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c  |    2 +-
 drivers/net/can/usb/mcba_usb.c                    |    4 +-
 drivers/net/can/usb/peak_usb/pcan_usb_core.c      |    4 +-
 drivers/net/can/usb/ucan.c                        |    4 +-
 drivers/net/can/usb/usb_8dev.c                    |    4 +-
 drivers/net/can/xilinx_can.c                      |    6 +-
 include/linux/can/bittiming.h                     |   44 +
 include/linux/can/dev.h                           |  135 +--
 include/linux/can/length.h                        |  174 +++
 include/linux/can/rx-offload.h                    |    3 +-
 include/linux/can/skb.h                           |   80 ++
 47 files changed, 1819 insertions(+), 1542 deletions(-)
 delete mode 100644 drivers/net/can/dev.c
 create mode 100644 drivers/net/can/dev/Makefile
 create mode 100644 drivers/net/can/dev/bittiming.c
 create mode 100644 drivers/net/can/dev/dev.c
 create mode 100644 drivers/net/can/dev/length.c
 create mode 100644 drivers/net/can/dev/netlink.c
 rename drivers/net/can/{ => dev}/rx-offload.c (98%)
 create mode 100644 drivers/net/can/dev/skb.c
 create mode 100644 include/linux/can/bittiming.h
 create mode 100644 include/linux/can/length.h

Comments

Marc Kleine-Budde Jan. 14, 2021, 7:32 a.m. UTC | #1
On 1/13/21 10:13 PM, Marc Kleine-Budde wrote:
> Hello Jakub, hello David,
> 
> this is a pull request of 17 patches for net-next/master.
> 
> The first two patches update the MAINTAINERS file, Lukas Bulwahn's patch fixes
> the files entry for the tcan4x5x driver, which was broken by me in net-next.
> A patch by me adds the a missing header file to the CAN Networking Layer.
> 
> The next 5 patches are by me and split the the CAN driver related
> infrastructure code into more files in a separate subdir. The next two patches
> by me clean up the CAN length related code. This is followed by 6 patches by
> Vincent Mailhol and me, they add helper code for for CAN frame length
> calculation neede for BQL support.
> 
> A patch by Vincent Mailhol adds software TX timestamp support.
> 
> The last patch is by me, targets the tcan4x5x driver, and removes the unneeded
> __packed attribute from the struct tcan4x5x_map_buf.
> 
> regards,
> Marc
> 
> ---
> 
> The following changes since commit f50e2f9f791647aa4e5b19d0064f5cabf630bf6e:
> 
>   hci: llc_shdlc: style: Simplify bool comparison (2021-01-12 20:18:30 -0800)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.12-20210113

Please don't pull. This request contains a bug. I've deleted the tag and send a
fixed pull request soon.

sorry for the noise,
Marc