Re: 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 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

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

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 info