| Message ID | 20201118160414.2731659-1-mkl@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pull-request: can 2020-11-18 | expand |
On Wed, 18 Nov 2020 17:04:10 +0100 Marc Kleine-Budde wrote: > Hello Jakub, hello David, > > here's a pull request for net/master consisting of 4 patches for net/master, > > Jimmy Assarsson provides two patches for the kvaser_pciefd and kvaser_usb > drivers, where the can_bittiming_const are fixed. > > The next patch is by me and fixes an erroneous flexcan_transceiver_enable() > during bus-off recovery in the flexcan driver. > > Jarkko Nikula's patch for the m_can driver fixes the IRQ handler to only > process the interrupts if the device is not suspended. Pulled, thanks! > P.S.: Can you merge net/master into net-next/master after merging this pull > request? That usually happens after Linus pulls from net, I will send a PR to him tomorrow, and then merge net -> net-next. Hope that works for you!
On 11/19/20 2:52 AM, Jakub Kicinski wrote: >> P.S.: Can you merge net/master into net-next/master after merging this pull >> request? > > That usually happens after Linus pulls from net, I will send a PR to him > tomorrow, and then merge net -> net-next. Hope that works for you! Yes, fine with me. I wasn't aware of the exact details. Thanks, Marc
Hello Jakub, hello David, here's a pull request for net/master consisting of 4 patches for net/master, Jimmy Assarsson provides two patches for the kvaser_pciefd and kvaser_usb drivers, where the can_bittiming_const are fixed. The next patch is by me and fixes an erroneous flexcan_transceiver_enable() during bus-off recovery in the flexcan driver. Jarkko Nikula's patch for the m_can driver fixes the IRQ handler to only process the interrupts if the device is not suspended. regards, Marc P.S.: Can you merge net/master into net-next/master after merging this pull request? --- The following changes since commit c09c8a27b9baa417864b9adc3228b10ae5eeec93: ipv4: use IS_ENABLED instead of ifdef (2020-11-17 17:02:03 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-5.10-20201118 for you to fetch changes up to a1f634463aaf2c94dfa13001dbdea011303124cc: can: m_can: process interrupt only when not runtime suspended (2020-11-18 16:37:32 +0100) ---------------------------------------------------------------- linux-can-fixes-for-5.10-20201118 ---------------------------------------------------------------- Jarkko Nikula (1): can: m_can: process interrupt only when not runtime suspended Jimmy Assarsson (2): can: kvaser_pciefd: Fix KCAN bittiming limits can: kvaser_usb: kvaser_usb_hydra: Fix KCAN bittiming limits Marc Kleine-Budde (1): can: flexcan: flexcan_chip_start(): fix erroneous flexcan_transceiver_enable() during bus-off recovery drivers/net/can/flexcan.c | 18 +++++++++--------- drivers/net/can/kvaser_pciefd.c | 4 ++-- drivers/net/can/m_can/m_can.c | 2 ++ drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-)