Messages in this thread | | | Date | Wed, 5 Aug 2020 16:32:46 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the fsinfo tree with the kbuid tree |
| |
Hi all,
Today's linux-next merge of the fsinfo tree got a conflict in:
samples/vfs/Makefile
between commit:
2f95ada7fe22 ("kbuild: introduce hostprogs-always-y and userprogs-always-y")
from the kbuid tree and commits:
7e786dee0b78 ("fsinfo: Add fsinfo() syscall to query filesystem information") 96f310048fba ("fsinfo: sample: Mount listing program")
from the fsinfo tree.
I fixed it up (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 6377a678134a,7bcdd7a2829e..000000000000 --- a/samples/vfs/Makefile +++ b/samples/vfs/Makefile @@@ -1,4 -1,9 +1,4 @@@ # SPDX-License-Identifier: GPL-2.0-only - userprogs-always-y += test-fsmount test-statx -userprogs := \ - test-fsinfo \ - test-fsmount \ - test-mntinfo \ - test-statx -always-y := $(userprogs) ++userprogs-always-y += test-fsinfo test-fsmount test-mntinfo test-statx userccflags += -I usr/include [unhandled content-type:application/pgp-signature] | |