Re: [PATCH V6 2/2] can: flexcan: add self wakeup support

[Marc Kleine-Budde]

On 11/26/18 2:12 AM, Joakim Zhang wrote:
> Firstly, thanks for reviewing the patch. Then, I am confused to do
> upstream on "linux-can" or "linux-can-next" due to I find "linux-can"
> is more updated than "linux-can-next".
linux-can is for fixes aginat the current net/master.
linux-can-next is for new features against net-next/master.

I just updates both branches and pushed linux-can-next/testing, too,
which is going the be the next pull request.

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   |