On Wed, Jan 17, 2018 at 10:12:27PM +0100, Richard Weinberger wrote: > On Fri, Jan 5, 2018 at 11:11 PM, Richard Weinberger <richard@xxxxxx> wrote: > > Eric, > > > > Am Freitag, 5. Januar 2018, 19:37:44 CET schrieb Eric Biggers: > >> On Wed, Nov 29, 2017 at 12:43:12PM -0800, Eric Biggers wrote: > >> > From: Eric Biggers <ebiggers@xxxxxxxxxx> > >> > > >> > This series switches ubifs to use the fscrypt helper functions for > >> > open/link/rename/lookup/setattr introduced in v4.15. > >> > > >> > These patches were originally sent in "[PATCH 00/25] fscrypt: add some > >> > higher-level helper functions". I've rebased them onto v4.15-rc1. > >> > > >> > Eric Biggers (5): > >> > ubifs: switch to fscrypt_file_open() > >> > ubifs: switch to fscrypt_prepare_link() > >> > ubifs: switch to fscrypt_prepare_rename() > >> > ubifs: switch to fscrypt_prepare_lookup() > >> > ubifs: switch to fscrypt_prepare_setattr() > >> > > >> > fs/ubifs/dir.c | 43 +++++++++++++------------------------------ > >> > fs/ubifs/file.c | 41 ++++------------------------------------- > >> > 2 files changed, 17 insertions(+), 67 deletions(-) > >> > >> Richard, can you take these for UBIFS for v4.16? > > > > Yes. Thanks a lot for cleaning this up. > > FYI, this series has merge conflicts with other fscrypt related > changes that went via Ted into fs/ubifs. > How so? These apply cleanly to both Linus' tree and to fscrypt/master currently. -- To unsubscribe from this list: send the line "unsubscribe linux-fscrypt" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html