From: David S. Miller Date: Sat, 12 Dec 2015 05:43:44 +0000 (-0500) Subject: Merge branch 'mpls-fixes' X-Git-Tag: firefly_0821_release~176^2~553^2~38 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d13cab4abec85d766a505f56f4465086f26ea10;p=firefly-linux-kernel-4.4.55.git Merge branch 'mpls-fixes' Robert Shearman says: ==================== mpls: fixes for nexthops without via addresses These four fixes all apply to the case of having an mpls route with an output device, but without a nexthop. Patches 2 and 3 could really have been combined in one patch, but I wanted to separate the fix for some recent breakage from the fix for a day-1 issue. ==================== Signed-off-by: David S. Miller --- 6d13cab4abec85d766a505f56f4465086f26ea10