1. 28 5月, 2021 3 次提交
    • J
      Merge tag 'linux-can-next-for-5.14-20210527' of... · b14b27ff
      Jakub Kicinski 提交于
      Merge tag 'linux-can-next-for-5.14-20210527' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      can-next 2021-05-27
      
      The first 2 patches are by Geert Uytterhoeven and convert the rcan_can
      and rcan_canfd device tree bindings to yaml.
      
      The next 2 patches are by Oliver Hartkopp and me and update the CAN
      uapi headers.
      
      zuoqilin's patch removes an unnecessary variable from the CAN proc
      code.
      
      Patrick Menschel contributes 3 patches for CAN ISOTP to enhance the
      error messages.
      
      Jiapeng Chong's patch removes two dead stores from the softing driver.
      
      The next 4 patches are by me and silence several warnings found by
      clang compiler.
      
      Jimmy Assarsson's patches for the kvaser_usb driver add support for
      the Kvaser hydra devices.
      
      Dario Binacchi provides 2 patches for the c_can driver, first removing
      an unused variable, then adding basic ethtool support to query driver
      and ring parameter info.
      
      The last 4 patches are by Torin Cooper-Bennun and clean up the m_can
      driver.
      
      * tag 'linux-can-next-for-5.14-20210527' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (21 commits)
        can: m_can: fix whitespace in a few comments
        can: m_can: make TXESC, RXESC config more explicit
        can: m_can: clean up CCCR reg defs, order by revs
        can: m_can: use bits.h macros for all regmasks
        can: c_can: add ethtool support
        can: c_can: remove unused variable struct c_can_priv::rxmasked
        can: kvaser_usb: Add new Kvaser hydra devices
        can: kvaser_usb: Rename define USB_HYBRID_{,PRO_}CANLIN_PRODUCT_ID
        can: at91_can: silence clang warning
        can: mcp251xfd: silence clang warning
        can: mcp251x: mcp251x_can_probe(): silence clang warning
        can: hi311x: hi3110_can_probe(): silence clang warning
        can: softing: Remove redundant variable ptr
        can: isotp: Add error message if txqueuelen is too small
        can: isotp: add symbolic error message to isotp_module_init()
        can: isotp: change error format from decimal to symbolic error names
        can: proc: remove unnecessary variables
        can: uapi: introduce CANFD_FDF flag for mixed content in struct canfd_frame
        can: uapi: update CAN-FD frame description
        dt-bindings: can: rcar_canfd: Convert to json-schema
        ...
      ====================
      
      Link: https://lore.kernel.org/r/20210527084532.1384031-1-mkl@pengutronix.deSigned-off-by: NJakub Kicinski <kuba@kernel.org>
      b14b27ff
    • J
      devlink: append split port number to the port name · f285f37c
      Jiri Pirko 提交于
      Instead of doing sprintf twice in case the port is split or not, append
      the split port suffix in case the port is split.
      Signed-off-by: NJiri Pirko <jiri@nvidia.com>
      Link: https://lore.kernel.org/r/20210527104819.789840-1-jiri@resnulli.usSigned-off-by: NJakub Kicinski <kuba@kernel.org>
      f285f37c
    • J
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 5ada57a9
      Jakub Kicinski 提交于
      cdc-wdm: s/kill_urbs/poison_urbs/ to fix build
      Signed-off-by: NJakub Kicinski <kuba@kernel.org>
      5ada57a9
  2. 27 5月, 2021 37 次提交