On 15.11.2022 09:15:45, Marc Kleine-Budde wrote: > On 15.11.2022 01:38:42, Vincent Mailhol wrote: > > This series contain cleanup patches and update of header files. There > > is no real relation between each patch (aside of 2/6 and 3/6 which > > form a pair) so I will end the cover letter here and let you refer to > > the short description. > > Applied to master. Squashed the following changes: > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 7088c5120154..a4e8484db931 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -33,6 +33,7 @@ set(PROGRAMS_CANLIB > cansequence > log2asc > log2long > + slcanpty > ) > > set(PROGRAMS_J1939 > @@ -58,7 +59,6 @@ set(PROGRAMS > isotptun > slcan_attach > slcand > - slcanpty > ) > > add_executable(can-calc-bit-timing Fixed linking with cmake > diff --git a/Makefile b/Makefile > index c3baa6b287fc..529343d576df 100644 > --- a/Makefile > +++ b/Makefile > @@ -46,6 +46,7 @@ MAKEFLAGS := -k > CFLAGS := -O2 -Wall -Wno-parentheses > > CPPFLAGS += \ > + -I. \ > -Iinclude \ > -DAF_CAN=PF_CAN \ > -DPF_CAN=29 \ Add the missing include search path to for mcp251xfd-dev-coredump...: > diff --git a/mcp251xfd/mcp251xfd-dev-coredump.c b/mcp251xfd/mcp251xfd-dev-coredump.c > index 422900f9cb9e..680c73479d1f 100644 > --- a/mcp251xfd/mcp251xfd-dev-coredump.c > +++ b/mcp251xfd/mcp251xfd-dev-coredump.c > @@ -17,7 +17,7 @@ > > #include <linux/kernel.h> > > -#include "../lib.h" > +#include "lib.h" > #include "mcp251xfd.h" > #include "mcp251xfd-dump-userspace.h" > Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: PGP signature
