Re: pull-request: can 2018-07-23

2018-07-25 Thread Marc Kleine-Budde
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

Re: pull-request: can 2018-07-23

2018-07-25 Thread David Miller
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

2018-07-24 Thread Marc Kleine-Budde
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 R

Re: pull-request: can 2018-07-23

2018-07-23 Thread David Miller
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 registe