On Wed, Jan 8, 2020 at 10:50 AM Theodore Y. Ts'o <tytso@xxxxxxx> wrote: > > On Mon, Jan 06, 2020 at 09:16:32PM -0800, Daniel Rosenberg wrote: > > changes: > > fscrypt moved to separate thread to rebase on fscrypt dev branch > > addressed feedback, plus some minor fixes > > What branch was this based on? There is no fscrypt dev branch, so I > took the fscrypt master branch, and then applied your fscrypt patches, > and then I tried to apply this patch series. I got patch conflicts > starting with the very first patch. > > Applying: TMP: fscrypt: Add support for casefolding with encryption > error: patch failed: fs/crypto/Kconfig:9 > error: fs/crypto/Kconfig: patch does not apply > error: patch failed: fs/crypto/fname.c:12 > error: fs/crypto/fname.c: patch does not apply > error: patch failed: fs/crypto/fscrypt_private.h:12 > error: fs/crypto/fscrypt_private.h: patch does not apply > error: patch failed: fs/crypto/keysetup.c:192 > error: fs/crypto/keysetup.c: patch does not apply > error: patch failed: fs/crypto/policy.c:67 > error: fs/crypto/policy.c: patch does not apply > error: patch failed: fs/inode.c:20 > error: fs/inode.c: patch does not apply > error: patch failed: include/linux/fscrypt.h:127 > error: include/linux/fscrypt.h: patch does not apply > Patch failed at 0001 TMP: fscrypt: Add support for casefolding with encryption > hint: Use 'git am --show-current-patch' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > - Ted > > -- > To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe@xxxxxxxxxxx. > This is based off of ToT master. I put in a dummy fscrypt patch so you wouldn't need to rebase on top of fscrypt, but I could just do future patch sets all on top of fscrypt-dev. I guess my attempt to make it easier just made it more confusing :(
|