From: Richard Weinberger <richard@nod.at>
To: Eric Biggers <ebiggers3@gmail.com>, linux-fscrypt@vger.kernel.org
Cc: Eric Biggers <ebiggers@google.com>,
linux-mtd@lists.infradead.org,
Adrian Hunter <adrian.hunter@intel.com>,
Artem Bityutskiy <dedekind1@gmail.com>,
Theodore Ts'o <tytso@mit.edu>
Subject: Re: [PATCH v2 0/5] ubifs: switch to new fscrypt helper functions
Date: Wed, 17 Jan 2018 22:36:12 +0100 [thread overview]
Message-ID: <6120539.HEfP5UEqVm@blindfold> (raw)
In-Reply-To: <20180117212354.xrsog7pekzoomq7p@gmail.com>
Am Mittwoch, 17. Januar 2018, 22:23:54 CET schrieb Eric Biggers:
> 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@nod.at>
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@google.com>
> > >> >
> > >> > 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.
Just checked, the problem is this commit:
commit 9a2cebc6e2368072490a574eafe0f0747d330bbd
Author: Eric Biggers <ebiggers@google.com>
Date: Fri Jan 5 11:30:03 2018 -0800
ubifs: free the encrypted symlink target
It exists also in my tree. I'll drop it and force push.
Sorry for messing up, next time I try hard to be more responsive.
Thanks,
//richard
next prev parent reply other threads:[~2018-01-17 21:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 20:43 [PATCH v2 0/5] ubifs: switch to new fscrypt helper functions Eric Biggers
2017-11-29 20:43 ` [PATCH v2 1/5] ubifs: switch to fscrypt_file_open() Eric Biggers
2017-11-29 20:43 ` [PATCH v2 2/5] ubifs: switch to fscrypt_prepare_link() Eric Biggers
2017-11-29 20:43 ` [PATCH v2 3/5] ubifs: switch to fscrypt_prepare_rename() Eric Biggers
2017-11-29 20:43 ` [PATCH v2 4/5] ubifs: switch to fscrypt_prepare_lookup() Eric Biggers
2017-11-29 20:43 ` [PATCH v2 5/5] ubifs: switch to fscrypt_prepare_setattr() Eric Biggers
2018-01-05 18:37 ` [PATCH v2 0/5] ubifs: switch to new fscrypt helper functions Eric Biggers
2018-01-05 22:11 ` Richard Weinberger
2018-01-17 21:12 ` Richard Weinberger
2018-01-17 21:23 ` Eric Biggers
2018-01-17 21:36 ` Richard Weinberger [this message]
2018-01-17 23:44 ` Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6120539.HEfP5UEqVm@blindfold \
--to=richard@nod.at \
--cc=adrian.hunter@intel.com \
--cc=dedekind1@gmail.com \
--cc=ebiggers3@gmail.com \
--cc=ebiggers@google.com \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox