lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 8 Jan 2020 13:50:05 -0500 From: "Theodore Y. Ts'o" <tytso@....edu> To: Daniel Rosenberg <drosen@...gle.com> Cc: linux-ext4@...r.kernel.org, Jaegeuk Kim <jaegeuk@...nel.org>, Chao Yu <chao@...nel.org>, linux-f2fs-devel@...ts.sourceforge.net, Eric Biggers <ebiggers@...nel.org>, linux-fscrypt@...r.kernel.org, Alexander Viro <viro@...iv.linux.org.uk>, Andreas Dilger <adilger.kernel@...ger.ca>, Jonathan Corbet <corbet@....net>, linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org, Gabriel Krisman Bertazi <krisman@...labora.com>, kernel-team@...roid.com Subject: Re: [PATCH v2 0/6] Support for Casefolding and Encryption 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
Powered by blists - more mailing lists