linux-next: manual merge of the fsinfo tree with the kbuid tree

linux-next: manual merge of the fsinfo tree with the kbuid tree

[Stephen Rothwell]

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

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

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

Re: linux-next: manual merge of the fsinfo tree with the kbuid tree

[Stephen Rothwell]

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

Hi all,

On Wed, 5 Aug 2020 16:32:46 +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:
> 
>   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.
> 
> 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

This is now a conflict between the fsinfo tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: manual merge of the fsinfo tree with the kbuid tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> This is now a conflict between the fsinfo tree and Linus' tree.

Please drop the fsinfo branch for now, thanks.

David

Re: linux-next: manual merge of the fsinfo tree with the kbuid tree

[Stephen Rothwell]

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

Hi David,

On Tue, 18 Aug 2020 09:19:18 +0100 David Howells <dhowells@redhat.com> wrote:
>
> Please drop the fsinfo branch for now, thanks.

OK, done.  What about the notifications tree?  (not pushing, just wondering)

-- 
Cheers,
Stephen Rothwell

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