On 07/23/2018 08:02 PM, David Miller wrote: > From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > 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-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
