On Fri, Jun 23, 2017 at 07:20:51PM +0200, Richard Weinberger wrote: > > The plan is that the fscrypt tree will just contain fscrypt "core" patches and > global changes/cleanups go thought the individual filesystem trees, right? Yes, it minimizes potential conflicts against other individual file system trees if we keep patches that are file system specific in their own tree. There will be times when we can't do that --- for example, if we need to make a change in the fscrypt directory that requires matching changes in all of the users of fscrypt at the same time. But when we do that there is always the chance that there will be merge conflicts that have to be manually reconciled by both Stephen Rothwell for linux-next and Linus during the merge window. But if we can avoid needing to do that, it's generally easier for all concerned. Cheers, - Ted
