From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the vfs tree with the f2fs tree
Date: Thu, 7 May 2015 12:05:07 +1000 [thread overview]
Message-ID: <20150507120507.53079643@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/f2fs/namei.c between commit 04002bddf33a ("f2fs: fix wrong error hanlder in f2fs_follow_link") from the f2fs tree and commits
32a09a012611 ("new ->follow_link() and ->put_link() calling
conventions") and e1a9e9dd8594 ("don't pass nameidata to
->follow_link()") from the vfs tree.
I fixed it up (the vfs tree changes are a superset of the f2fs tree
changes, so I just used them) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-05-07 2:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 2:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 23:47 linux-next: manual merge of the vfs tree with the f2fs tree Stephen Rothwell
2023-12-20 0:13 ` Stephen Rothwell
2023-12-20 1:34 ` Al Viro
2023-12-20 3:05 ` Stephen Rothwell
2023-12-20 4:44 ` Al Viro
2021-04-19 0:53 Stephen Rothwell
2018-10-03 0:12 Stephen Rothwell
2017-11-08 23:06 Stephen Rothwell
2017-11-08 23:01 Stephen Rothwell
2017-02-27 0:05 Stephen Rothwell
2017-02-27 8:27 ` David Howells
2016-07-25 0:21 Stephen Rothwell
2016-05-03 1:41 Stephen Rothwell
2015-04-13 1:53 Stephen Rothwell
2014-06-10 1:23 Stephen Rothwell
2014-04-29 0:37 Stephen Rothwell
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=20150507120507.53079643@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=viro@ZenIV$(echo .)linux.org.uk \
/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