From: David S. Miller Date: Thu, 20 Aug 2015 20:01:57 +0000 (-0700) Subject: Merge branch 'vrf-cleanups-part-2' X-Git-Tag: firefly_0821_release~176^2~1159^2~128 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b86d598d0c9d847c3ff0fc1b31c762551a0f0e12;p=firefly-linux-kernel-4.4.55.git Merge branch 'vrf-cleanups-part-2' Nikolay Aleksandrov says: ==================== vrf: cleanups part 2 This is the next part of vrf cleanups, patch 1 drops the SLAB_PANIC when creating kmem cache since it's handled, patch 02 removes a slave duplicate check which is already done by the lower/upper code, patch 3 moves the ndo_add_slave code around a bit so we can drop an error label and patch 4 drops the master device checks which are unnecessary because the ops are taken from the master device itself so it can't be different. ==================== Acked-by: David Ahern --- b86d598d0c9d847c3ff0fc1b31c762551a0f0e12