[systemd-devel] kdbus: merge 3.17 branch into master?

[David Herrmann]

Hi Greg

On Tue, Aug 19, 2014 at 1:29 PM, Greg KH <gregkh at linuxfoundation.org> wrote:
> Hi all,
>
> Now that memfd is merged into 3.17-rc1, should we merge the 3.17 branch
> in the kdbus tree into master as well?  Right now, the test directory on
> master doesn't build properly on older kernels due to linux/memfd.h not
> being present, so it seems that we are already thinking the code is
> there:
>
>   TARGET_CC kdbus-util.o
> kdbus-util.c:27:25: fatal error: linux/memfd.h: No such file or directory
>  #include <linux/memfd.h>
>                          ^

I thought Daniel already cherry-picked the patches from the 3.17
branch into master?

david at david-tp ~/dev/kdbus $ git log master..origin/3.17 --oneline
b59133f metadata: drop support for kernels < v3.15
307be39 Kconfig: depend on TMPFS
60a5b53 test: adopt new memfd interface
790a8a8 switch to upstream kernel memfd implementation (ABI+API break)
7219f86 metadata: follow 3.17 changes for current->start_time

All these patches are available in master (with different sha1 due to
cherry-pick).

Thanks
David