Hi all,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/md.c
between commit:
afeee514ce7f ("md: convert to bioset_init()/mempool_init()")
from the block tree and commit:
5a409b4f56d5 ("MD: fix lock contention for flush bios")
from the md tree.
I fixed it up (see
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5-ppl.c
between commit:
74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions
index")
from the block tree and commit:
ddc088238cd6 ("md: Runtime support for multiple ppls")
from
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5.c
between commit:
4e4cbee93d56 ("block: switch bios to blk_status_t")
from the block tree and commit:
66a8066d55fd ("md: simplify code with bio_io_error")
from the md tree.
I fixed it up (the latte
Hi all,
Today's linux-next merge of the md tree got conflicts in:
drivers/md/linear.c
drivers/md/raid0.c
between commit:
3deff1a70d59 ("md: support REQ_OP_WRITE_ZEROES")
from the block tree and commits:
868f604b1de2 ("md/linear: improve bio splitting.")
f00d7c85be9e ("md/raid0: fix
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5.c
between commit:
48920ff2a5a9 ("block: remove the discard_zeroes_data flag")
from the block tree and commit:
97d53438081e ("Revert "md/raid5: limit request size according to
implementation limits""
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/md.h
between commit:
3deff1a70d59 ("md: support REQ_OP_WRITE_ZEROES")
from the block tree and commits:
d8e29fbc3bed ("md: move two macros into md.h")
513e2faa0138 ("md: prepare for managing resync I/O pa
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/md.c
between commit:
70fd76140a6c ("block,fs: use REQ_* flags directly")
from the block tree and commit:
46533ff7fefb ("md: Use REQ_FAILFAST_* on metadata writes where appropriate")
from the md tree.
I f
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5-cache.c
between commit:
70fd76140a6c ("block,fs: use REQ_* flags directly")
from the block tree and commits:
b4c625c67362 ("md/r5cache: r5cache recovery: part 1")
3bddb7f8f264 ("md/r5cache: handle
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid1.c
between commit:
796a5cf083c2 ("md: use bio op accessors")
from the block tree and commit:
707a6a420ccf ("md/raid1: add rcu protection to rdev in fix_read_error")
from the md tree.
I fixed it up (
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid10.c
between commit:
796a5cf083c2 ("md: use bio op accessors")
from the block tree and commits:
f90145f317ef ("md/raid10: add rcu protection to rdev access in
raid10_sync_request."
d094d6860b66 ("md
Hi Neil,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5.c
between commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
8ae126660fdd ("block: kill merge_bvec_fn() completely")
from the block tree and commit:
1722781be955 ("md/raid5: switch to
Hi Neil,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid10.c
between commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
from the block tree and commit:
90421c7cfde6 ("md/raid10: ensure device failure recorded before write request
returns.")
f
Hi Neil,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid0.c
between commit:
8ae126660fdd ("block: kill merge_bvec_fn() completely")
from the block tree and commit:
927d881980b7 ("md/raid0: update queue parameter in a safer location.")
from the md tree.
I fix
On Wed, 15 Jan 2014 15:07:43 +1100 Stephen Rothwell
wrote:
> Hi Neil,
>
> Today's linux-next merge of the md tree got a conflict in
> drivers/md/raid10.c between commit 4f024f3797c4 ("block: Abstract out
> bvec iterator") from the block tree and commit b50c259e25d9 ("md/raid10:
> fix two bugs in
Hi Neil,
Today's linux-next merge of the md tree got a conflict in
drivers/md/raid10.c between commit 4f024f3797c4 ("block: Abstract out
bvec iterator") from the block tree and commit b50c259e25d9 ("md/raid10:
fix two bugs in handling of known-bad-blocks") from the md tree.
I fixed it up (see bel
Hi Neil,
Today's linux-next merge of the md tree got a conflict in
drivers/md/raid0.c between commit 4363ac7c13a9 ("block: Implement support
for WRITE SAME") from the block tree and commit c9264cda8f11 ("md: raid 0
supports TRIM") from the md tree.
I fixed it up (see below) and can carry the fix
16 matches
Mail list logo
