$ git diff --patch-with-stat --summary 84c8e4dcdfafeda4d8a68709e748ead7e187f991..dc4f39f119f998be7123847ae3dda17c7a231eb4

 .abf.yml            |  2 +-
 arm64-common.config |  2 ++
 kernel-release.spec | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 978ab4e..d52a723 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,5 +1,5 @@
 sources:
   linux-4.15.tar.sign: 4ec662ae15c98e2342cdafedfa8ed4512fd69c5a
   linux-4.15.tar.xz: 5cf2693d2c6bf1e69a9216dceca6183c60eb11d5
-  patch-4.15.2.xz: b3395db9b90d9c2a16392aed77bd8a55299ac136
   saa716x-driver.tar.xz: 603d6e561f6c09b19b05ca53b55458caad849c97
+  patch-4.15.5.xz: 189a049856750ad40c5de53c1c0d2c0b4a1906b1
diff --git a/arm64-common.config b/arm64-common.config
index 77a2150..b233cd2 100644
--- a/arm64-common.config
+++ b/arm64-common.config
@@ -1555,3 +1555,5 @@ CONFIG_UNIPHIER_EFUSE=m
 CONFIG_MESON_MX_EFUSE=m
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/kernel-release.spec b/kernel-release.spec
index 4dd2cf0..76a2f29 100644
--- a/kernel-release.spec
+++ b/kernel-release.spec
@@ -6,7 +6,7 @@
 # compose tar.xz name and release
 %define kernelversion	4
 %define patchlevel	15
-%define sublevel	2
+%define sublevel	5
 %define relc		0
 # Only ever wrong on x.0 releases...
 %define previous	%{kernelversion}.%(echo $((%{patchlevel}-1)))
@@ -715,6 +715,15 @@ Conflicts:	%{_lib}cpufreq-devel
 This package contains the development files for cpupower.
 %endif
 
+%package -n bootsplash-packer
+Summary:	Tool for packing bootsplash images
+Group:		System/Kernel and hardware
+Version:	%{kversion}
+Release:	%{rpmrel}
+
+%description -n bootsplash-packer
+Tool for packing bootsplash images
+
 %if %{with build_x86_energy_perf_policy}
 %package -n x86_energy_perf_policy
 Version:	%{kversion}
@@ -1433,6 +1442,8 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
 %kmake -C tools/power/cpupower CPUFREQ_BENCH=false LDFLAGS="%{optflags}"
 %endif
 
+%kmake -C tools/bootsplash LDFLAGS="%{optflags}"
+
 %ifarch %{ix86} x86_64
 %if %{with build_x86_energy_perf_policy}
 %kmake -C tools/power/x86/x86_energy_perf_policy CC=clang LDFLAGS="-Wl,--hash-style=sysv -Wl,--build-id=none"
@@ -1561,6 +1572,8 @@ install -m644 %{SOURCE50} %{buildroot}%{_unitdir}/cpupower.service
 install -m644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
 %endif
 
+install -m755 tools/bootsplash/bootsplash-packer %{buildroot}%{_bindir}/
+
 %ifarch %{ix86} x86_64
 %if %{with build_x86_energy_perf_policy}
 mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man8
@@ -1681,6 +1694,9 @@ mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man8
 %{_includedir}/cpufreq.h
 %endif
 
+%files -n bootsplash-packer
+%{_bindir}/bootsplash-packer
+
 %ifarch %{ix86} x86_64
 %if %{with build_x86_energy_perf_policy}
 %files -n x86_energy_perf_policy