summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2018-03-11 17:37:01 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2018-03-11 17:37:01 +0100
commit4576e0eca90e8c644d8583937ac532705a553313 (patch)
tree2a62d7ae69eda26b95903e7597b89c0ba66727bb /Makefile
parent732ccfad6e9f2239c4cbc541203c81c57732bfa3 (diff)
parent96427a5164f3eff6ee6eb924dbb53adb6eaa082d (diff)
Merge 4.14.26 into android-4.14
Changes in 4.14.26 bpf: fix mlock precharge on arraymaps bpf: fix memory leak in lpm_trie map_free callback function bpf: fix rcu lockdep warning for lpm_trie map_free callback bpf, x64: implement retpoline for tail call bpf, arm64: fix out of bounds access in tail call bpf: add schedule points in percpu arrays management bpf: allow xadd only on aligned memory bpf, ppc64: fix out of bounds access in tail call KVM: x86: fix backward migration with async_PF Linux 4.14.26 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 09d089e61b3d..df0b96dbf0d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
-SUBLEVEL = 25
+SUBLEVEL = 26
EXTRAVERSION =
NAME = Petit Gorille