From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the fsinfo tree with the kbuild tree
Date: Thu, 14 May 2020 18:09:48 +1000 [thread overview]
Message-ID: <20200514180948.5d5b38a5@canb.auug.org.au> (raw)
In-Reply-To: <20200512190614.1bebd8ba@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2020-05-14 8:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200514180948.5d5b38a5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.