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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <7b1215df-f1ea-c366-17ff-bc5265e58ffa@pengutronix.de>
Date:   Mon, 26 Nov 2018 12:34:10 +0100
From:   Marc Kleine-Budde <mkl@...gutronix.de>
To:     Joakim Zhang <qiangqing.zhang@....com>,
        "linux-can@...r.kernel.org" <linux-can@...r.kernel.org>,
        "robh+dt@...nel.org" <robh+dt@...nel.org>
Cc:     "wg@...ndegger.com" <wg@...ndegger.com>,
        "mark.rutland@....com" <mark.rutland@....com>,
        "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        dl-linux-imx <linux-imx@....com>,
        Aisheng DONG <aisheng.dong@....com>
Subject: Re: [PATCH V6 2/2] can: flexcan: add self wakeup support

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   |