linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the fsinfo tree with the kbuild tree
@ 2020-05-12  9:06 Stephen Rothwell
  2020-05-14  8:09 ` Stephen Rothwell
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-05-12  9:06 UTC (permalink / raw)
  To: David Howells, Masahiro Yamada
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 1669 bytes --]

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

diff --cc samples/vfs/Makefile
index 00b6824f9237,19be60ab950e..000000000000
--- a/samples/vfs/Makefile
+++ b/samples/vfs/Makefile
@@@ -1,5 -1,17 +1,7 @@@
  # 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
 +userccflags += -I usr/include
+ 
 -always-y := $(hostprogs)
 -
 -HOSTCFLAGS_test-fsinfo.o += -I$(objtree)/usr/include
 -HOSTLDLIBS_test-fsinfo += -static -lm
 -HOSTCFLAGS_test-mntinfo.o += -I$(objtree)/usr/include
 -
 -HOSTCFLAGS_test-fsmount.o += -I$(objtree)/usr/include
 -HOSTCFLAGS_test-statx.o += -I$(objtree)/usr/include
++test-fsinfo-userldflags += -static -lm

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the fsinfo tree with the kbuild tree
  2020-05-12  9:06 linux-next: manual merge of the fsinfo tree with the kbuild tree Stephen Rothwell
@ 2020-05-14  8:09 ` Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-05-14  8:09 UTC (permalink / raw)
  To: David Howells, Masahiro Yamada
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 1742 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-05-14  8:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-12  9:06 linux-next: manual merge of the fsinfo tree with the kbuild tree Stephen Rothwell
2020-05-14  8:09 ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).