lkml.org 
[lkml]   [2020]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the fsinfo tree with the kbuild tree
Hi all,

On Tue, 12 May 2020 19:06:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the fsinfo tree got a conflict in:
>
> samples/vfs/Makefile
>
> between commit:
>
> 757172f3d6f9 ("samples: vfs: build sample programs for target architecture")
>
> from the kbuild tree and commits:
>
> 51d01aee410b ("fsinfo: Add fsinfo() syscall to query filesystem information")
> d3ee0e9da65d ("fsinfo: sample: Mount listing program")
>
> from the fsinfo tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The new resolution is below.

--
Cheers,
Stephen Rothwell

diff --cc samples/vfs/Makefile
index 00b6824f9237,4a6e3058812e..000000000000
--- a/samples/vfs/Makefile
+++ b/samples/vfs/Makefile
@@@ -1,5 -1,15 +1,5 @@@
# SPDX-License-Identifier: GPL-2.0-only
- userprogs := test-fsmount test-statx
-# List of programs to build
++userprogs := test-fsinfo test-fsmount test-mntinfo test-statx
+always-y := $(userprogs)

-hostprogs := \
- test-fsinfo \
- test-fsmount \
- test-mntinfo \
- test-statx
-
-always-y := $(hostprogs)
-
-HOSTCFLAGS_test-fsinfo.o += -I$(objtree)/usr/include
-HOSTCFLAGS_test-fsmount.o += -I$(objtree)/usr/include
-HOSTCFLAGS_test-mntinfo.o += -I$(objtree)/usr/include
-HOSTCFLAGS_test-statx.o += -I$(objtree)/usr/include
+userccflags += -I usr/include
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-05-14 10:11    [W:0.663 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site