On 12/13/2011 11:26 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20111213:
> 
> New tree: uapi
> 
> The net-next tree gained a conflict against the net tree and a build
> failure for which I applied a patch.

net/core/sock.c: In function '__sk_mem_schedule':
net/core/sock.c:1758:22: error: 'UNDER_LIMIT' undeclared (first use in this function)
net/core/sock.c:1758:22: note: each undeclared identifier is reported only once for each function it appears in
net/core/sock.c:1772:23: error: 'SOFT_LIMIT' undeclared (first use in this function)
net/core/sock.c:1777:24: error: 'OVER_LIMIT' undeclared (first use in this function)

Full randconfig file is attached.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***