From: "Theodore Y. Ts'o" <tytso@mit.edu>
To: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, ebiggers@kernel.org
Subject: Re: [f2fs-dev] [PATCH 2/7] f2fs: use IS_ENCRYPTED() to check encryption status
Date: Mon, 26 Nov 2018 12:34:35 -0500 [thread overview]
Message-ID: <20181126173435.GA22888@thunk.org> (raw)
In-Reply-To: <20181126040038.GD7904@thunk.org>
On Sun, Nov 25, 2018 at 11:00:38PM -0500, Theodore Y. Ts'o wrote:
>
> It might be that the simplest way to solve things is to merge the f2fs
> dev branch up to 79c66e75720c. This will have the net effect of
> including the five patches listed above onto the fscrypt git tree. So
> long you don't plan to rebase or otherwise change these five patches,
> it should avoid any merge conflicts.
I've set up a git branch which has the f2fs dev branch, 4.20-rc4, the
fsverity patches, and part of Chandan's patch series here:
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git test-working
There is a minor conflict when I did a trial merge with f2fs.git's dev
branch, but it's pretty obvious to how to resolve it.
Jaegeuk, Eric, Chandan, please take a look and let me know what you
think.
- Ted
WARNING: multiple messages have this Message-ID (diff)
From: "Theodore Y. Ts'o" <tytso@mit.edu>
To: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: ebiggers@kernel.org, linux-ext4@vger.kernel.org,
linux-fscrypt@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Subject: Re: [PATCH 2/7] f2fs: use IS_ENCRYPTED() to check encryption status
Date: Mon, 26 Nov 2018 12:34:35 -0500 [thread overview]
Message-ID: <20181126173435.GA22888@thunk.org> (raw)
In-Reply-To: <20181126040038.GD7904@thunk.org>
On Sun, Nov 25, 2018 at 11:00:38PM -0500, Theodore Y. Ts'o wrote:
>
> It might be that the simplest way to solve things is to merge the f2fs
> dev branch up to 79c66e75720c. This will have the net effect of
> including the five patches listed above onto the fscrypt git tree. So
> long you don't plan to rebase or otherwise change these five patches,
> it should avoid any merge conflicts.
I've set up a git branch which has the f2fs dev branch, 4.20-rc4, the
fsverity patches, and part of Chandan's patch series here:
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git test-working
There is a minor conflict when I did a trial merge with f2fs.git's dev
branch, but it's pretty obvious to how to resolve it.
Jaegeuk, Eric, Chandan, please take a look and let me know what you
think.
- Ted
next prev parent reply other threads:[~2018-11-27 4:29 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 5:23 [PATCH 0/7] Remove fs specific fscrypt and fsverity build config options Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-19 5:23 ` [PATCH 1/7] ext4: use IS_ENCRYPTED() to check encryption status Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-27 0:35 ` Eric Biggers
2018-11-27 0:35 ` Eric Biggers
2018-11-19 5:23 ` [PATCH 2/7] f2fs: " Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-19 6:24 ` Chao Yu
2018-11-19 6:24 ` Chao Yu
2018-11-19 21:23 ` [f2fs-dev] " Jaegeuk Kim
2018-11-19 21:23 ` Jaegeuk Kim
2018-11-26 3:41 ` [f2fs-dev] " Theodore Y. Ts'o
2018-11-26 3:41 ` Theodore Y. Ts'o
2018-11-26 4:00 ` [f2fs-dev] " Theodore Y. Ts'o
2018-11-26 4:00 ` Theodore Y. Ts'o
2018-11-26 17:34 ` Theodore Y. Ts'o [this message]
2018-11-26 17:34 ` Theodore Y. Ts'o
2018-11-26 23:52 ` [f2fs-dev] " Jaegeuk Kim
2018-11-26 23:52 ` Jaegeuk Kim
2018-11-29 10:38 ` [f2fs-dev] " Chandan Rajendra
2018-11-29 10:38 ` Chandan Rajendra
2018-11-29 19:05 ` [f2fs-dev] " Eric Biggers
2018-11-29 19:05 ` Eric Biggers
2018-11-30 5:27 ` [f2fs-dev] " Chandan Rajendra
2018-11-30 5:27 ` Chandan Rajendra
2018-11-30 17:44 ` [f2fs-dev] " Eric Biggers
2018-11-30 17:44 ` Eric Biggers
2018-11-19 5:23 ` [PATCH 3/7] fscrypt: Remove filesystem specific build config option Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-27 0:14 ` Eric Biggers
2018-11-27 0:14 ` Eric Biggers
2018-11-27 13:29 ` Chandan Rajendra
2018-11-27 13:29 ` Chandan Rajendra
2018-11-19 5:23 ` [PATCH 4/7] Add S_VERITY and IS_VERITY() Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-27 0:08 ` Eric Biggers
2018-11-27 0:08 ` Eric Biggers
2018-11-27 13:30 ` Chandan Rajendra
2018-11-27 13:30 ` Chandan Rajendra
2018-11-19 5:23 ` [PATCH 5/7] ext4: use IS_VERITY() to check inode's fsverity status Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-26 17:36 ` Theodore Y. Ts'o
2018-11-26 17:36 ` Theodore Y. Ts'o
2018-11-27 0:29 ` Eric Biggers
2018-11-27 0:29 ` Eric Biggers
2018-11-27 3:03 ` Chandan Rajendra
2018-11-27 3:03 ` Chandan Rajendra
2018-11-28 13:49 ` Chandan Rajendra
2018-11-28 13:49 ` Chandan Rajendra
2018-11-19 5:23 ` [PATCH 6/7] f2fs: " Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-19 6:25 ` [f2fs-dev] " Chao Yu
2018-11-19 6:25 ` Chao Yu
2018-11-19 6:25 ` Chao Yu
2018-11-27 0:41 ` Eric Biggers
2018-11-27 0:41 ` Eric Biggers
2018-11-19 5:23 ` [PATCH 7/7] fsverity: Remove filesystem specific build config option Chandan Rajendra
2018-11-19 5:23 ` Chandan Rajendra
2018-11-27 0:45 ` Eric Biggers
2018-11-27 0:45 ` Eric Biggers
2018-11-27 13:31 ` Chandan Rajendra
2018-11-27 13:31 ` Chandan Rajendra
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=20181126173435.GA22888@thunk.org \
--to=tytso@mit.edu \
--cc=chandan@linux.vnet.ibm.com \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.