From: David S. Miller Date: Wed, 22 Apr 2015 18:24:55 +0000 (-0400) Subject: Merge branch 'mpls' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0e2d686530d5e6c3c50c2c4f9ef8d6428252c35c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'mpls' Robert Shearman says: ==================== mpls: ABI changes for security and correctness V2: - don't treat loopback interfaces specially by enabling mpls by default These changes make mpls not be enabled by default on all interfaces when in use for security, along with ensuring that a label not valid as an outgoing label can be added in mpls routes. This series contains three ABI/behaviour-affecting changes which have been split out from "[PATCH net-next v4 0/6] mpls: Behaviour-changing improvements" without any further modification. These changes need to be considered for 4.1 otherwise we'll be stuck with the current behaviour/ABI forever. ==================== Reviewed-by: "Eric W. Biederman" Signed-off-by: David S. Miller --- 0e2d686530d5e6c3c50c2c4f9ef8d6428252c35c