net: vrf: correct FRA_L3MDEV encode type

[mirror_ubuntu-artful-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 781b12be59bf3dbc59939235f08fe0b569cf7ecb..b82e5333226dee814c3add9f6433fc4ae962ab49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 13
-SUBLEVEL = 1
+SUBLEVEL = 15
 EXTRAVERSION =
 NAME = Fearless Coyote
 
@@ -965,7 +965,11 @@ ifdef CONFIG_STACK_VALIDATION
   ifeq ($(has_libelf),1)
     objtool_target := tools/objtool FORCE
   else
-    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+    ifdef CONFIG_UNWINDER_ORC
+      $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+    else
+      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+    endif
     SKIP_STACK_VALIDATION := 1
     export SKIP_STACK_VALIDATION
   endif