summaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-09-15 17:45:23 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-15 17:45:23 -0400
commitfe42048e2a7a2b96acf1c60c7b0eb8ad14e00f44 (patch)
treef7bf9d856db7fed8f823a097567d5b8a3d396132 /net/xfrm
parentd6ce2628f32271c037a8c12e1994c9fba3a4af49 (diff)
parent23a3c99201954d8ffe92e599e3c3039985280f1b (diff)
downloadlinux-fe42048e2a7a2b96acf1c60c7b0eb8ad14e00f44.tar.bz2
Merge branch 'bnx2-deps'
Anish Bhatt says: ==================== net: Fix randconfig errros in bnx2i/bnx2fc caused by IPV6 Just like CNIC bnx2i/bnx2fc also have their tristate dependent on IPV6, however using the same solution as CNIC can cause recursive dependecies during make. Based on suggestions by Randy Dunlap, SCSI_NETLINK now depends on NET instead of selecting NET. Second patch fixes the actual randconfig error. Entire thread can be followed here : https://lkml.org/lkml/2014/9/9/500 Fixes: c99d667e8527 ("cnic : Cleanup CONFIG_IPV6 & VLAN check") ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions