Re: [PATCH 00/29] UBIFS File Encryption v1
From: Theodore Ts'o
Date: Mon Nov 28 2016 - 21:28:35 EST
On Sun, Nov 27, 2016 at 05:27:58PM -0800, Eric Biggers wrote:
> Shouldn't the branch be rebased to remove the CONFIG_VMAP_STACK fixes which are
> already in Linus' tree?
> fscrypto: don't use on-stack buffer for key derivation
> fscrypto: don't use on-stack buffer for filename encryption
> Otherwise we'll end up with duplicate commits.
Given that the ubifs folks are depending on the existing branch,
having duplicate commits is considered an acceptable tradeoff to not
rebasing a published commit that other trees are depending on.
I tell people that the ext4.git dev branch is a rewinding branch, so
people shouldn't be building other trees on top of it unless they are
willing to deal with the fact that it can be rebased. However, i
didn't give that warning for the fscrypt branch, so I'd much rather
not rewind/rebase it.