diff --git a/debian/changelog b/debian/changelog
index 841cc44cf..afb10498b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (4.18.10-2) UNRELEASED; urgency=medium
+
+  * [rt][arm64,armhf] Fix build failure after rebasing onto 4.18.10
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Fri, 05 Oct 2018 18:09:26 +0100
+
 linux (4.18.10-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch b/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch
index 19cc858d5..42bd68531 100644
--- a/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch
+++ b/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch
@@ -37,7 +37,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 +	raw_spin_unlock_irqrestore(&devtree_lock, flags);
 +
  	if (!phandles)
- 		goto out;
+-		goto out;
++		return;
  
  	cache_entries = roundup_pow_of_two(phandles);
  	phandle_cache_mask = cache_entries - 1;