From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Chao Yu <chao2.yu@samsung.com>
Subject: linux-next: manual merge of the block tree with the f2fs tree
Date: Thu, 30 Jul 2015 13:19:43 +1000 [thread overview]
Message-ID: <20150730131943.3ab8bac5@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/data.c
between commit:
8e5b935bf1ce ("f2fs: maintain extent cache in separated file")
from the f2fs tree and commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/f2fs/data.c
index 111f180fd1d2,8f0baa7ffb50..000000000000
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -27,7 -26,10 +27,7 @@@
#include "trace.h"
#include <trace/events/f2fs.h>
- static void f2fs_read_end_io(struct bio *bio, int err)
-static struct kmem_cache *extent_tree_slab;
-static struct kmem_cache *extent_node_slab;
-
+ static void f2fs_read_end_io(struct bio *bio)
{
struct bio_vec *bvec;
int i;
next reply other threads:[~2015-07-30 3:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 3:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-12-03 3:43 linux-next: manual merge of the block tree with the f2fs tree Stephen Rothwell
2020-12-03 3:47 ` Chao Yu
2020-12-03 3:57 ` Stephen Rothwell
2020-12-14 20:12 ` Stephen Rothwell
2020-12-17 1:50 ` Stephen Rothwell
2016-11-22 3:42 Stephen Rothwell
2016-07-11 4:52 Stephen Rothwell
2016-06-20 2:37 Stephen Rothwell
2016-06-09 3:26 Stephen Rothwell
2016-06-09 3:34 ` Stephen Rothwell
2014-01-06 6:03 Stephen Rothwell
2013-12-18 3:57 Stephen Rothwell
2013-12-12 2:57 Stephen Rothwell
2013-12-02 4:04 Stephen Rothwell
2013-11-26 1:00 Stephen Rothwell
2013-11-26 0:56 Stephen Rothwell
2013-11-01 3:29 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=20150730131943.3ab8bac5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=chao2.yu@samsung.com \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).