Re: pull-request: can 2018-07-23
On 07/26/2018 01:26 AM, David Miller wrote: > From: Marc Kleine-Budde > Date: Tue, 24 Jul 2018 09:27:30 +0200 > >> Thanks David. Can you please merge net into next-next, as I've some >> patches for net-next that would result in a merge conflict between net >> and net-next later. > > This has now been done. Thanks. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature
Re: pull-request: can 2018-07-23
From: Marc Kleine-Budde Date: Tue, 24 Jul 2018 09:27:30 +0200 > Thanks David. Can you please merge net into next-next, as I've some > patches for net-next that would result in a merge conflict between net > and net-next later. This has now been done.
Re: pull-request: can 2018-07-23
On 07/23/2018 08:02 PM, David Miller wrote: > From: Marc Kleine-Budde > Date: Mon, 23 Jul 2018 14:58:31 +0200 > >> this is a pull request of 12 patches for net/master. >> >> The patch by Stephane Grosjean for the peak_canfd CAN driver fixes a problem >> with older firmware. The next patch is by Roman Fietze and fixes the setup of >> the CCCR register in the m_can driver. Nicholas Mc Guire's patch for the >> mpc5xxx_can driver adds missing error checking. The two patches by Faiz Abbas >> fix the runtime resume and clean up the probe function in the m_can driver. >> The >> last 7 patches by Anssi Hannula fix several problem in the xilinx_can driver. > > Pulled, thanks Marc. Thanks David. Can you please merge net into next-next, as I've some patches for net-next that would result in a merge conflict between net and net-next later. regards, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature
Re: pull-request: can 2018-07-23
From: Marc Kleine-Budde Date: Mon, 23 Jul 2018 14:58:31 +0200 > this is a pull request of 12 patches for net/master. > > The patch by Stephane Grosjean for the peak_canfd CAN driver fixes a problem > with older firmware. The next patch is by Roman Fietze and fixes the setup of > the CCCR register in the m_can driver. Nicholas Mc Guire's patch for the > mpc5xxx_can driver adds missing error checking. The two patches by Faiz Abbas > fix the runtime resume and clean up the probe function in the m_can driver. > The > last 7 patches by Anssi Hannula fix several problem in the xilinx_can driver. Pulled, thanks Marc.
pull-request: can 2018-07-23
Hello David, this is a pull request of 12 patches for net/master. The patch by Stephane Grosjean for the peak_canfd CAN driver fixes a problem with older firmware. The next patch is by Roman Fietze and fixes the setup of the CCCR register in the m_can driver. Nicholas Mc Guire's patch for the mpc5xxx_can driver adds missing error checking. The two patches by Faiz Abbas fix the runtime resume and clean up the probe function in the m_can driver. The last 7 patches by Anssi Hannula fix several problem in the xilinx_can driver. regards, Marc --- The following changes since commit c9ce1fa1c24b08e13c2a3b5b1f94a19c9eaa982c: net: prevent ISA drivers from building on PPC32 (2018-07-22 11:12:29 -0700) are available in the Git repository at: ssh://g...@gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.18-20180723 for you to fetch changes up to 8ebd83bdb027f29870d96649dba18b91581ea829: can: xilinx_can: fix power management handling (2018-07-23 14:34:46 +0200) linux-can-fixes-for-4.18-20180723 Anssi Hannula (7): can: xilinx_can: fix device dropping off bus on RX overrun can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK can: xilinx_can: fix recovery from error states not being propagated can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting can: xilinx_can: fix RX overflow interrupt not being enabled can: xilinx_can: fix incorrect clear of non-processed interrupts can: xilinx_can: fix power management handling Faiz Abbas (2): can: m_can: Fix runtime resume call can: m_can: Move accessing of message ram to after clocks are enabled Nicholas Mc Guire (1): can: mpc5xxx_can: check of_iomap return before use Roman Fietze (1): can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can.ctrlmode Stephane Grosjean (1): can: peak_canfd: fix firmware < v3.3.0: limit allocation to 32-bit DMA addr only drivers/net/can/m_can/m_can.c | 18 +- drivers/net/can/mscan/mpc5xxx_can.c | 5 + drivers/net/can/peak_canfd/peak_pciefd_main.c | 19 ++ drivers/net/can/xilinx_can.c | 392 +++--- 4 files changed, 321 insertions(+), 113 deletions(-)
