* pull-request: can-next 2018-01-16
@ 2018-01-19 9:48 Marc Kleine-Budde
2018-01-19 15:31 ` pull-request: can-next 2018-01-16,pull-request: " David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2018-01-19 9:48 UTC (permalink / raw)
To: netdev; +Cc: davem, kernel, linux-can
[-- Attachment #1.1: Type: text/plain, Size: 1351 bytes --]
Hello David,
this is a pull request for net-next/master consisting of 1 patch.
This patch by Arnd Bergmann for the m_can driver silences a compiler
warning if CONFIG_PM is not selected.
regards,
Marc
---
The following changes since commit ef58ca38dbda0642e293bcaa2e05edc79677c617:
net/sched/sch_prio.c: work around gcc-4.4.4 union initializer issues (2018-01-18 21:11:31 -0500)
are available in the Git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.16-20180119
for you to fetch changes up to 58359193193c4261d340b2f7f028e5096d4e4d15:
can: m_can: mark runtime-PM handlers as __maybe_unused (2018-01-19 10:41:15 +0100)
----------------------------------------------------------------
linux-can-next-for-4.16-20180119
----------------------------------------------------------------
Arnd Bergmann (1):
can: m_can: mark runtime-PM handlers as __maybe_unused
drivers/net/can/m_can/m_can.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: pull-request: can-next 2018-01-16,pull-request: can-next 2018-01-16
2018-01-19 9:48 pull-request: can-next 2018-01-16 Marc Kleine-Budde
@ 2018-01-19 15:31 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-01-19 15:31 UTC (permalink / raw)
To: mkl; +Cc: netdev, kernel, linux-can
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 19 Jan 2018 10:48:11 +0100
> this is a pull request for net-next/master consisting of 1 patch.
>
> This patch by Arnd Bergmann for the m_can driver silences a compiler
> warning if CONFIG_PM is not selected.
Pulled, thanks Marc.
^ permalink raw reply [flat|nested] 4+ messages in thread
* pull-request: can-next 2018-01-16
@ 2018-07-27 9:40 Marc Kleine-Budde
0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2018-07-27 9:40 UTC (permalink / raw)
To: netdev; +Cc: davem, kernel, linux-can
[-- Attachment #1.1: Type: text/plain, Size: 7392 bytes --]
Hello David,
this is a pull request for net-next/master consisting of 38 patches.
Dan Murphy's patch fixes the path to a file in the comment of the CAN
Error Message Frame Mask structure.
A patch by Colin Ian King fixes a typo in the cc770 driver.
The next patch is by me an sorts the Kconfigand Makefile entries of the
CAN-USB driver subdir alphabetically.
The patch by Jakob Unterwurzacher adds support for the UCAN USB-CAN
adapter.
YueHaibing's patch replaces a open coded skb_put()+memset() by
skb_put_zero() in the CAN-dev infrastructure.
Zhu Yi provides a patch to enable multi-queue CAN devices.
Three patches by Luc Van Oostenryck fix the return value of several
driver's xmit function, I contribute a patch for the a fourth driver.
Fabio Estevam's patch switches the flexcan driver to SPDX identifier.
Two patches by Jia-Ju Bai replace the mdelay() by a usleep_range() in
the sja1000 drivers.
The next 6 patches are by Anssi Hannula and refactor the xilinx CAN
driver and add support for the xilinx CAN FD core.
A patch by Gustavo A. R. Silva adds fallthrough annotation to the
peak_usb driver.
5 patches by Stephane Grosjean for the peak CANFD driver do some
cleanups and provide more improvements for further firmware releases.
The remaining 13 patches are by Jimmy Assarsson and the first clean up
the kvaser_usb driver, so that the later patches add support for the
Kvaser USB hydra family.
regards,
Marc
---
The following changes since commit ecbcd689d74a394b711d2360aef7e5d007ec9d98:
Merge tag 'mlx5e-updates-2018-07-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (2018-07-26 21:33:24 -0700)
are available in the Git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.19-20180727
for you to fetch changes up to 1f6ed42c742e8d1cfd3811ef7a134eaa75a511d6:
can: kvaser_usb: Simplify struct kvaser_cmd_cardinfo (2018-07-27 10:40:19 +0200)
----------------------------------------------------------------
linux-can-next-for-4.19-20180727
----------------------------------------------------------------
Anssi Hannula (6):
can: xilinx_can: only report warning and passive states on state changes
can: xilinx_can: use can_change_state()
can: xilinx_can: update stats.tx_bytes after transmission
dt-bindings: can: xilinx_can: add Xilinx CAN FD bindings
can: xilinx_can: refactor code in preparation for CAN FD support
can: xilinx_can: add support for Xilinx CAN FD core
Colin Ian King (1):
can: cc770: fix spelling mistake: "comptibility" -> "compatibility"
Dan Murphy (1):
can: uapi: can.h: Fix can error class mask dir path
Fabio Estevam (1):
can: flexcan: Switch to SPDX identifier
Gustavo A. R. Silva (1):
can: peak_usb: mark expected switch fall-throughs
Jakob Unterwurzacher (1):
can: ucan: add driver for Theobroma Systems UCAN devices
Jia-Ju Bai (2):
can: sja1000: Replace mdelay with usleep_range in peak_pci_probe
can: sja1000: Replace mdelay with usleep_range in pcan_add_channels
Jimmy Assarsson (13):
can: kvaser_usb: Remove unnecessary return
can: kvaser_usb: Remove unused commands and defines
can: kvaser_usb: Rename message/msg to command/cmd
can: kvaser_usb: Replace USB timeout constants with one define
can: kvaser_usb: Add pointer to struct usb_interface into struct kvaser_usb
can: kvaser_usb: Refactor kvaser_usb_get_endpoints()
can: kvaser_usb: Refactor kvaser_usb_init_one()
can: kvaser_usb: Improve logging messages
can: kvaser_usb: Fix typos
can: kvaser_usb: Add SPDX GPL-2.0 license identifier
can: kvaser_usb: Split driver into kvaser_usb_core.c and kvaser_usb_leaf.c
can: kvaser_usb: Add support for Kvaser USB hydra family
can: kvaser_usb: Simplify struct kvaser_cmd_cardinfo
Luc Van Oostenryck (3):
can: janz-ican3: fix ican3_xmit()'s return type
can: sun4i: fix sun4ican_start_xmit()'s return type
can: xilinx: fix xcan_start_xmit()'s return type
Marc Kleine-Budde (2):
can: usb: Kconfig/Makefile: sort alphabetically
can: flexcan: fix flexcan_start_xmit()'s return type
Stephane Grosjean (5):
can: peak_canfd: improves 32-bit alignment
can: peak_canfd: remove useless defined symbols
can: peak_canfd: use ndev irq instead of pci_dev one
can: peak_canfd: fix typo in error message
can: peak_canfd: rearrange the way resources are released
YueHaibing (1):
can: dev: use skb_put_zero to simplfy code
Zhu Yi (1):
can: dev: enable multi-queue for SocketCAN devices
.../devicetree/bindings/net/can/xilinx_can.txt | 35 +-
Documentation/networking/can_ucan_protocol.rst | 332 ++++
Documentation/networking/index.rst | 1 +
drivers/net/can/cc770/cc770.c | 2 +-
drivers/net/can/dev.c | 14 +-
drivers/net/can/flexcan.c | 33 +-
drivers/net/can/janz-ican3.c | 2 +-
drivers/net/can/peak_canfd/peak_canfd.c | 2 +-
drivers/net/can/peak_canfd/peak_pciefd_main.c | 20 +-
drivers/net/can/sja1000/peak_pci.c | 2 +-
drivers/net/can/sja1000/peak_pcmcia.c | 2 +-
drivers/net/can/sun4i_can.c | 2 +-
drivers/net/can/usb/Kconfig | 48 +-
drivers/net/can/usb/Makefile | 7 +-
drivers/net/can/usb/kvaser_usb.c | 2085 --------------------
drivers/net/can/usb/kvaser_usb/Makefile | 2 +
drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 188 ++
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 835 ++++++++
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2028 +++++++++++++++++++
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 1358 +++++++++++++
drivers/net/can/usb/peak_usb/pcan_usb.c | 1 +
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 1 +
drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 2 +
drivers/net/can/usb/ucan.c | 1613 +++++++++++++++
drivers/net/can/xilinx_can.c | 512 +++--
include/linux/can/dev.h | 7 +-
include/uapi/linux/can.h | 2 +-
27 files changed, 6841 insertions(+), 2295 deletions(-)
create mode 100644 Documentation/networking/can_ucan_protocol.rst
delete mode 100644 drivers/net/can/usb/kvaser_usb.c
create mode 100644 drivers/net/can/usb/kvaser_usb/Makefile
create mode 100644 drivers/net/can/usb/kvaser_usb/kvaser_usb.h
create mode 100644 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
create mode 100644 drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
create mode 100644 drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
create mode 100644 drivers/net/can/usb/ucan.c
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |-
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* pull-request: can-next 2018-01-16
@ 2018-01-16 14:28 Marc Kleine-Budde
0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2018-01-16 14:28 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel
[-- Attachment #1.1: Type: text/plain, Size: 2684 bytes --]
Hello David,
this is a pull request for net-next/master consisting of 9 patches.
This is a series of patches, some of them initially by Franklin S Cooper
Jr, which was picked up by Faiz Abbas. Faiz Abbas added some patches
while working on this series, I contributed one as well.
The first two patches add support to CAN device infrastructure to limit
the bitrate of a CAN adapter if the used CAN-transceiver has a certain
maximum bitrate.
The remaining patches improve the m_can driver. They add support for
bitrate limiting to the driver, clean up the driver and add support for
runtime PM.
regards,
Marc
---
The following changes since commit 79d891c1bbb6573cef31dbc2030fba61cfa1df6d:
Merge tag 'linux-can-next-for-4.16-20180105' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next (2018-01-15 16:13:34 -0500)
are available in the Git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-4.16-20180116
for you to fetch changes up to 31643dc8fc66abdd3f68800483df4a5420f5e69c:
can: m_can: Add call to of_can_transceiver (2018-01-16 15:11:35 +0100)
----------------------------------------------------------------
linux-can-next-for-4.16-20180116
----------------------------------------------------------------
Faiz Abbas (3):
can: m_can: Remove check for version when allocating m_can net device
can: m_can: Move allocation of net device to probe
can: m_can: Add PM Support
Franklin S Cooper Jr (5):
dt-bindings: can: can-transceiver: Document new binding
can: dev: Add support for limiting configured bitrate
dt-bindings: can: m_can: Document new can transceiver binding
can: m_can: Support higher speed CAN-FD bitrates
can: m_can: Add call to of_can_transceiver
Marc Kleine-Budde (1):
can: m_can: get rid of function free_m_can_dev()
.../bindings/net/can/can-transceiver.txt | 24 +++
.../devicetree/bindings/net/can/m_can.txt | 9 +
drivers/net/can/dev.c | 45 ++++-
drivers/net/can/m_can/m_can.c | 183 +++++++++++++--------
include/linux/can/dev.h | 7 +
include/uapi/linux/can/netlink.h | 1 +
6 files changed, 202 insertions(+), 67 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/can/can-transceiver.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-can" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-07-27 9:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-19 9:48 pull-request: can-next 2018-01-16 Marc Kleine-Budde
2018-01-19 15:31 ` pull-request: can-next 2018-01-16,pull-request: " David Miller
-- strict thread matches above, loose matches on Subject: below --
2018-07-27 9:40 pull-request: " Marc Kleine-Budde
2018-01-16 14:28 Marc Kleine-Budde
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.