On Tue, Apr 30, 2013 at 10:05:52PM +0800, Fengguang Wu wrote:
> 
> FYI, kernel build failed on
> 
> tree:   git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next master
> head:   d7c35d45ce991ae01b6008abef120173fc9c3814
> commit: dba554cc481ab6582202dd954f927e7657ee453a Merge remote-tracking branch 'net-next/master'
> date:   5 hours ago
> config: i386-randconfig-r05-0429 (attached as .config)
> 
> All error/warnings:
> 
>    In file included from net/netfilter/nf_log.c:4:0:
>    include/linux/proc_fs.h:58:20: error: redefinition of 'proc_set_size'
>    include/linux/proc_fs.h:51:20: note: previous definition of 'proc_set_size' was here
>    include/linux/proc_fs.h: In function 'proc_net_mkdir':
>    include/linux/proc_fs.h:69:2: error: implicit declaration of function 'proc_mkdir_data' [-Werror=implicit-function-declaration]
>    include/linux/proc_fs.h:69:2: warning: return makes pointer from integer without a cast [enabled by default]
>    net/netfilter/nf_log.c: In function 'nf_log_net_init':
> >> net/netfilter/nf_log.c:373:38: error: 'struct netns_nf' has no member named 'proc_netfilter'
>    net/netfilter/nf_log.c: In function 'nf_log_net_exit':
> >> net/netfilter/nf_log.c:381:37: error: 'struct netns_nf' has no member named 'proc_netfilter'
>    cc1: some warnings being treated as errors

I have attached a patch to resolve the issue. Thanks.