Thread (1 message) 1 message, 1 author, 2012-04-23

Re: linux-next: build failure after merge of the net-next tree

From: David Miller <davem@davemloft.net>
Date: 2012-04-23 04:27:31
Also in: lkml, netdev

Possibly related (same subject, not in this thread)

From: Stephen Rothwell <redacted>
Date: Mon, 23 Apr 2012 12:14:51 +1000
After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

net/ax25/af_ax25.c: In function 'ax25_exit':
net/ax25/af_ax25.c:2015:2: error: implicit declaration of function 'ax25_unregister_sysctl' [-Werror=implicit-function-declaration]

Caused by a mismerge between commit 3adadc08cc1e ("net ax25: Reorder
ax25_exit to remove races") from the net tree and commit 0ca7a4c87d27
("net ax25: Simplify and cleanup the ax25 sysctl handling") from the
net-next tree.

I have applied the following merge fix patch:
Looks correct, and I'll resolve this the next time I pull
net into net-next.

Thanks!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help