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

Hi David, On Tue, 18 Aug 2020 09:19:18 +0100 David Howells wrote: > > Please drop the fsinfo branch for now, thanks. OK, done. What about the notifications tree? (not pushing, just wondering) -- Cheers, Stephen Rothwell pgpDmLj6JQZ34.pgp Description: OpenPGP digital signature

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

Stephen Rothwell 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

Hi all, On Wed, 5 Aug 2020 16:32:46 +1000 Stephen Rothwell 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 c