From: David S. Miller <davem@davemloft.net>
Date: Mon, 15 Sep 2014 21:45:23 +0000 (-0400)
Subject: Merge branch 'bnx2-deps'
X-Git-Tag: v3.17-rc7~31^2~25
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fe42048e2a7a2b96acf1c60c7b0eb8ad14e00f44;p=linux.git

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>
---

fe42048e2a7a2b96acf1c60c7b0eb8ad14e00f44