From: David S. Miller Date: Tue, 28 Oct 2014 19:28:30 +0000 (-0400) Subject: Merge branch 'dsa-net' X-Git-Tag: v3.18-rc3~17^2~31 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3923d68dc05033aa843b67d73110a6d402ac6e14;p=karo-tx-linux.git Merge branch 'dsa-net' Andrew Lunn says: ==================== DSA tagging mismatches The second patch is a fix, which should be applied to -rc. It is possible to get a DSA configuration which does not work. The patch stops this happening. The first patch detects this situation, and errors out the probe of DSA, making it more obvious something is wrong. It is not required to apply it -rc. v2 fixes the use case pointed out by Florian, that a switch driver may use DSA_TAG_PROTO_NONE which the patch did not correctly handle. ==================== Signed-off-by: David S. Miller --- 3923d68dc05033aa843b67d73110a6d402ac6e14