From: David Miller <da...@davemloft.net>
Date: Thu, 18 Jul 2019 12:39:39 -0700 (PDT)

> Series applied, thank you.

Actually, I had to revert, this breaks the build:

In file included from ./include/net/netfilter/nf_tables_offload.h:4,
                 from <command-line>:
./include/net/flow_offload.h: In function ‘flow_block_cb_add’:
./include/net/flow_offload.h:297:2: error: implicit declaration of function 
‘list_add_tail’ [-Werror=implicit-function-declaration]
  list_add_tail(&block_cb->list, &offload->cb_list);
  ^~~~~~~~~~~~~
./include/net/flow_offload.h: In function ‘flow_block_cb_remove’:
./include/net/flow_offload.h:303:2: error: implicit declaration of function 
‘list_move’ [-Werror=implicit-function-declaration]
  list_move(&block_cb->list, &offload->cb_list);
  ^~~~~~~~~
./include/net/flow_offload.h: In function ‘flow_block_init’:
./include/net/flow_offload.h:346:2: error: implicit declaration of function 
‘INIT_LIST_HEAD’; did you mean ‘XATTR_LIST_MAX’? 
[-Werror=implicit-function-declaration]
  INIT_LIST_HEAD(&flow_block->cb_list);
  ^~~~~~~~~~~~~~
  XATTR_LIST_MAX
In file included from ./include/net/netfilter/nf_tables.h:5,
                 from ./include/net/netfilter/nf_tables_offload.h:5,
                 from <command-line>:
./include/linux/list.h: At top level:
./include/linux/list.h:26:20: warning: conflicting types for ‘INIT_LIST_HEAD’
 static inline void INIT_LIST_HEAD(struct list_head *list)
                    ^~~~~~~~~~~~~~
./include/linux/list.h:26:20: error: static declaration of ‘INIT_LIST_HEAD’ 
follows non-static declaration
In file included from ./include/net/netfilter/nf_tables_offload.h:4,
                 from <command-line>:
./include/net/flow_offload.h:346:2: note: previous implicit declaration of 
‘INIT_LIST_HEAD’ was here
  INIT_LIST_HEAD(&flow_block->cb_list);
  ^~~~~~~~~~~~~~
In file included from ./include/net/netfilter/nf_tables.h:5,
                 from ./include/net/netfilter/nf_tables_offload.h:5,
                 from <command-line>:
./include/linux/list.h:91:20: warning: conflicting types for ‘list_add_tail’
 static inline void list_add_tail(struct list_head *new, struct list_head *head)
                    ^~~~~~~~~~~~~
./include/linux/list.h:91:20: error: static declaration of ‘list_add_tail’ 
follows non-static declaration
In file included from ./include/net/netfilter/nf_tables_offload.h:4,
                 from <command-line>:
./include/net/flow_offload.h:297:2: note: previous implicit declaration of 
‘list_add_tail’ was here
  list_add_tail(&block_cb->list, &offload->cb_list);
  ^~~~~~~~~~~~~
In file included from ./include/net/netfilter/nf_tables.h:5,
                 from ./include/net/netfilter/nf_tables_offload.h:5,
                 from <command-line>:
./include/linux/list.h:199:20: warning: conflicting types for ‘list_move’
 static inline void list_move(struct list_head *list, struct list_head *head)
                    ^~~~~~~~~
./include/linux/list.h:199:20: error: static declaration of ‘list_move’ follows 
non-static declaration
In file included from ./include/net/netfilter/nf_tables_offload.h:4,
                 from <command-line>:
./include/net/flow_offload.h:303:2: note: previous implicit declaration of 
‘list_move’ was here
  list_move(&block_cb->list, &offload->cb_list);
  ^~~~~~~~~
cc1: some warnings being treated as errors
make[1]: *** [scripts/Makefile.build:304: 
include/net/netfilter/nf_tables_offload.h.s] Error 1
make: *** [Makefile:1077: include] Error 2
make: *** Waiting for unfinished jobs....

Reply via email to