From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Chris Mason <clm@fb.com>,
Josef Bacik <jbacik@fb.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kent Overstreet <kent.overstreet@gmail.com>
Subject: linux-next: manual merge of the block tree with the btrfs tree
Date: Mon, 24 Aug 2015 14:15:35 +1000 [thread overview]
Message-ID: <20150824141535.42e0c4e1@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/volumes.c
between commits:
da2f0f74cf7d ("Btrfs: add support for blkio controllers")
3a9508b0221d ("btrfs: fix compile when block cgroups are not enabled")
from the btrfs tree and commit:
0e28997ec476 ("btrfs: remove bio splitting and merge_bvec_fn() calls")
from the block tree.
I fixed it up (I removed breakup_stripe_bio) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-08-24 4:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 4:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 2:45 linux-next: manual merge of the block tree with the btrfs tree Stephen Rothwell
2023-12-21 5:23 ` Christoph Hellwig
2022-07-15 3:25 Stephen Rothwell
2021-02-02 2:45 Stephen Rothwell
2021-02-14 22:17 ` Stephen Rothwell
2020-12-07 2:44 Stephen Rothwell
2020-07-09 2:58 Stephen Rothwell
2016-06-14 2:44 Stephen Rothwell
2015-08-24 4:16 Stephen Rothwell
2015-08-24 4:16 Stephen Rothwell
2015-08-24 4:15 Stephen Rothwell
2014-01-09 4:01 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=20150824141535.42e0c4e1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=clm@fb.com \
--cc=jbacik@fb.com \
--cc=kent.overstreet@gmail.com \
--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