summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-10-07 09:54:31 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2021-10-07 09:54:31 +0200
commit908f942eb5a641a982f78aee19cea4a344631920 (patch)
tree516da3a6738717ecf58443b15c66cbdbd8bd30ee /Makefile
parent2e7b242209a1b320135bab3822ad45281a11deb3 (diff)
parenta123b2f4737a9f4e34e92e502972b6388f90133f (diff)
Merge 4.4.287 into android-4.4-p
Changes in 4.4.287 Revert "arm64: Mark __stack_chk_guard as __ro_after_init" Linux 4.4.287 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I51e06ec62e6fcc1246ae88edcd79b9ef56fb5e23
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a021343eb62f..c2ae80aaaa4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 286
+SUBLEVEL = 287
EXTRAVERSION =
NAME = Blurry Fish Butt