Re: [PATCH] netfilter: use __u8 instead of uint8_t in uapi header

[Masahiro Yamada]

Hi Pablo,

On Sun, Sep 22, 2019 at 4:13 PM Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> wrote:
>
> On Sun, Sep 22, 2019 at 09:11:11AM +0200, Pablo Neira Ayuso wrote:
> > On Sat, Sep 21, 2019 at 10:46:48PM +0900, Masahiro Yamada wrote:
> > > When CONFIG_UAPI_HEADER_TEST=y, exported headers are compile-tested to
> > > make sure they can be included from user-space.
> > >
> > > Currently, linux/netfilter_bridge/ebtables.h is excluded from the test
> > > coverage. To make it join the compile-test, we need to fix the build
> > > errors attached below.
> > >
> > > For a case like this, we decided to use __u{8,16,32,64} variable types
> > > in this discussion:
> > >
> > >   https://lkml.org/lkml/2019/6/5/18
> > >
> > > Build log:
> > >
> > >   CC      usr/include/linux/netfilter_bridge/ebtables.h.s
> > > In file included from <command-line>:32:0:
> > > ./usr/include/linux/netfilter_bridge/ebtables.h:126:4: error: unknown type name âuint8_tâ
> > >     uint8_t revision;
> > >     ^~~~~~~
> > > ./usr/include/linux/netfilter_bridge/ebtables.h:139:4: error: unknown type name âuint8_tâ
> > >     uint8_t revision;
> > >     ^~~~~~~
> > > ./usr/include/linux/netfilter_bridge/ebtables.h:152:4: error: unknown type name âuint8_tâ
> > >     uint8_t revision;
> > >     ^~~~~~~
> >
> > Applied.
>
> Patch does not apply cleanly to nf.git, I have to keep it back, sorry

Perhaps, reducing the context (git am -C<N>) might help.

Shall I rebase and resend it?

Thanks.

> $ git am /tmp/yamada.masahiro.txt -s
> Applying: netfilter: use __u8 instead of uint8_t in uapi header
> error: patch failed: usr/include/Makefile:37
> error: usr/include/Makefile: patch does not apply
> Patch failed at 0001 netfilter: use __u8 instead of uint8_t in uapi header
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".



-- 
Best Regards
Masahiro Yamada