From f3cd21c8f1633473c3f0c8b751f80ff70a1d63c2 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@scylladb.com>
Date: Mon, 3 Oct 2016 12:54:38 +0300
Subject: [PATCH] Merge seastar upstream

* seastar 0e60722...18f7bb8 (1):
  > core/memory: Fix compilation errors
---
 seastar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seastar b/seastar
index 0e60722bb6..18f7bb8270 160000
--- a/seastar
+++ b/seastar
@@ -1 +1 @@
-Subproject commit 0e60722bb6e06de403eb1a6ee997f863fd2334e0
+Subproject commit 18f7bb8270b9dd7ee300bd77a286e800dff2c249