From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Theodore Ts'o <tytso@mit•edu>
Subject: linux-next: manual merge of the f2fs tree with Linus' tree
Date: Tue, 23 Feb 2016 10:09:51 +1100 [thread overview]
Message-ID: <20160223100951.4b9a7b73@canb.auug.org.au> (raw)
Hi Jaegeuk,
Today's linux-next merge of the f2fs tree got conflicts in:
fs/ext4/crypto.c
fs/ext4/ext4.h
fs/ext4/namei.c
between commits:
28b4c263961c ("ext4 crypto: revalidate dentry after adding or removing the key")
ff978b09f973 ("ext4 crypto: move context consistency check to ext4_file_open()")
from Linus' tree (presumably) bug fixes in v4.5-rc5 and commit:
e29c55a8d406 ("ext4 crypto: migrate into vfs's crypto engine")
from the f2fs tree.
I do not have enough information to fix this up, so I dropped the last
commit from the f2fs tree for today.
I *assume* that this has been passed by Ted - I can;t easily tell as
there are no Acked-by or Reviewed-by tags in the f2fs tree commit. If
so, perhaps you could either merge v4.5-rc5 yourself and do the
resolutions necessary (with nice comments in the merge commit), or give
me some hints on how to do it.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-02-22 23:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 23:09 Stephen Rothwell [this message]
2016-02-23 0:24 ` linux-next: manual merge of the f2fs tree with Linus' tree Jaegeuk Kim
-- strict thread matches above, loose matches on Subject: below --
2017-07-07 0:43 Stephen Rothwell
2017-07-07 1:57 ` Jaegeuk Kim
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=20160223100951.4b9a7b73@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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