From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 29 Mar 2018 05:53:20 +0000 (+0200)
Subject: Prep v236.1: To catch up with upstream, already branch out v236-stable.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2cf68b85429bf1700e0d617ff0b31b14611dad66;p=elogind.git

Prep v236.1: To catch up with upstream, already branch out v236-stable.
---

diff --git a/meson.build b/meson.build
index f6c81c1a8..9b15cee22 100644
--- a/meson.build
+++ b/meson.build
@@ -518,7 +518,8 @@ endforeach
 
 foreach ident : [
         ['memfd_create',      '''#define _GNU_SOURCE
-//                                 #include <sys/mman.h>'''],
+                                 #include <sys/mman.h>
+                                 #include <sys/memfd.h>'''],
         ['gettid',            '''#include <sys/types.h>'''],
         ['pivot_root',        '''#include <stdlib.h>'''],     # no known header declares pivot_root
         ['name_to_handle_at', '''#define _GNU_SOURCE
@@ -531,7 +532,7 @@ foreach ident : [
         ['kcmp',              '''#include <linux/kcmp.h>'''],
         ['keyctl',            '''#include <sys/types.h>
                                  #include <keyutils.h>'''],
-        ['copy_file_range',   '''#include <sys/syscall.h>
+        ['copy_file_range',   '''#define _GNU_SOURCE
                                  #include <unistd.h>'''],
         ['bpf',               '''#include <sys/syscall.h>
                                  #include <unistd.h>'''],
diff --git a/pwx/pwx_last_mutual_commits.txt b/pwx/pwx_last_mutual_commits.txt
index 418e1ba27..f4399f8b3 100644
--- a/pwx/pwx_last_mutual_commits.txt
+++ b/pwx/pwx_last_mutual_commits.txt
@@ -7,5 +7,6 @@ v232-stable 79a5d862a7abe903f456a75d6d1ca3c11adfa379
 v233-stable 589fa9087a49e4250099bb6a4cf00358379fa3a4
 master 265710c2055254a98ed6dcd6aa172ca509a33553
 master-last efaa3176ad0e763a0fafd4519d4391813a88ba0e
+v236-stable 590171d1c956ac3b073bc73a7ca1f5529b01ab83
 v236 83fefc8888620ce27ba39d906bd879bbcb6bc84e
 v236-last f78a88beca362e62ca242499950a097fbcdb10d2