[PATCH] can-doc: Fixed a wrong filepath in can.txt

[PATCH] can-doc: Fixed a wrong filepath in can.txt

[Stefan Tatschner]

Signed-off-by: Stefan Tatschner <stefan@sevenbyte.org>
---
 Documentation/networking/can.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index 2236d6d..0a2859a 100644
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -234,7 +234,7 @@ solution for a couple of reasons:
   mechanisms. Inside this filter definition the (interested) type of
   errors may be selected. The reception of error messages is disabled
   by default. The format of the CAN error message frame is briefly
-  described in the Linux header file "include/linux/can/error.h".
+  described in the Linux header file "include/uapi/linux/can/error.h".
 
 4. How to use SocketCAN
 ------------------------
-- 
2.2.2

Re: [PATCH] can-doc: Fixed a wrong filepath in can.txt

[Jonathan Corbet]

On Thu,  5 Feb 2015 15:33:24 +0100
Stefan Tatschner <stefan@sevenbyte.org> wrote:

> -  described in the Linux header file "include/linux/can/error.h".
> +  described in the Linux header file "include/uapi/linux/can/error.h".

Looks good.  It needed a changelog, though, so I took the liberty of
adding one.

jon

Re: [PATCH] can-doc: Fixed a wrong filepath in can.txt

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

On 02/05/2015 04:00 PM, Jonathan Corbet wrote:
> On Thu,  5 Feb 2015 15:33:24 +0100
> Stefan Tatschner <stefan@sevenbyte.org> wrote:
> 
>> -  described in the Linux header file "include/linux/can/error.h".
>> +  described in the Linux header file "include/uapi/linux/can/error.h".
> 
> Looks good.  It needed a changelog, though, so I took the liberty of
> adding one.

Are you taking the patch?
FWIW: Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] can-doc: Fixed a wrong filepath in can.txt

[Jonathan Corbet]

On Thu, 05 Feb 2015 16:37:17 +0100
Marc Kleine-Budde <mkl@pengutronix.de> wrote:

> > Looks good.  It needed a changelog, though, so I took the liberty of
> > adding one.  
> 
> Are you taking the patch?

Yes, sorry, I applied it to the docs tree.

jon

Re: [PATCH] can-doc: Fixed a wrong filepath in can.txt

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]

On 02/05/2015 04:48 PM, Jonathan Corbet wrote:
> On Thu, 05 Feb 2015 16:37:17 +0100
> Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> 
>>> Looks good.  It needed a changelog, though, so I took the liberty of
>>> adding one.  
>>
>> Are you taking the patch?
> 
> Yes, sorry, I applied it to the docs tree.

Thanks, just wanted to be sure that the patch doesn't get lost.

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]