Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/extent_io.c
between commit:
2ce8afc500de ("btrfs: extent_io: Kill the forward declaration of
flush_write_bio")
from the btrfs-kdave tree and commit:
c3a7ce738009 ("btrfs: use mp_bvec_last_segment to get bio
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/disk-io.c
between commits:
21445903e814 ("btrfs: preallocate device flush bio")
56305f3eb397 ("btrfs: move dev stats accounting out of wait_dev_flush")
from the btrfs-kdave tree and commit:
4e4cbee93d56 ("b
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/inode.c
between commits:
c6100a4b4e3d ("Btrfs: replace tree->mapping with tree->private_data")
725130bac585 ("Btrfs: use bio_clone_bioset_partial to simplify DIO submit")
3892ac9086a8 ("Btrfs: unify naming o
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/inode.c
between commits:
b6f68032afbe ("Btrfs: replace tree->mapping with tree->private_data")
b7da91627746 ("Btrfs: use bio_clone_bioset_partial to simplify DIO submit")
170a8768b6b7 ("Btrfs: unify naming o
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
between commit:
b6f68032afbe ("Btrfs: replace tree->mapping with tree->private_data")
from the btrfs-kdave tree and commit:
4e4cbee93d56 ("block: switch bios to blk_status_t
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/btrfs/disk-io.c
fs/btrfs/disk-io.h
between commits:
b6f68032afbe ("Btrfs: replace tree->mapping with tree->private_data")
9035b5dbc576 ("btrfs: btrfs_io_bio_alloc never fails, skip error handling")
from the btrfs-
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/compression.c
between commit:
c1045c6859c1 ("btrfs: opencode trivial compressed_bio_alloc, simplify error
handling")
from the btrfs-kdave tree and commit:
4e4cbee93d56 ("block: switch bios to blk_status_t")
On Thu, Nov 17, 2016 at 02:23:01PM +0100, Christoph Hellwig wrote:
> On Wed, Nov 16, 2016 at 07:49:29PM -0700, Jens Axboe wrote:
> > doesn't look correct, if bio_readpage_error() is called from the
> > ->bi_end_io() handler. bi_size is generally zeroed at that time.
>
> At least some of these bio
On Wed, Nov 16, 2016 at 07:49:29PM -0700, Jens Axboe wrote:
> doesn't look correct, if bio_readpage_error() is called from the
> ->bi_end_io() handler. bi_size is generally zeroed at that time.
At least some of these bios are magic btrfs-internal ones that never
reach the block layer. But I don'
On 11/16/2016 07:01 PM, Stephen Rothwell wrote:
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/btrfs/extent_io.c
fs/btrfs/inode.c
between commit:
01a1400f8545 ("btrfs: only check bio size to see if a repair bio should have the
failfast flag")
from the btrfs-k
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/btrfs/extent_io.c
fs/btrfs/inode.c
between commit:
01a1400f8545 ("btrfs: only check bio size to see if a repair bio should have
the failfast flag")
from the btrfs-kdave tree and commit:
70fd76140a6c ("block,fs:
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/volumes.h
between commit:
26112f7f4726 ("btrfs: take an fs_info parameter directly when the root is not
used otherwise")
from the btrfs-kdave tree and commit:
81a75f6781de ("btrfs: use bio fields for op and
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/volumes.c
between commit:
26112f7f4726 ("btrfs: take an fs_info parameter directly when the root is not
used otherwise")
from the btrfs-kdave tree and commit:
4e49ea4a3d27 ("block/fs/drivers: remove rw argu
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/inode.c
between commit:
b286384aac32 ("btrfs: root->fs_info cleanup, add fs_info convenience
variables")
26112f7f4726 ("btrfs: take an fs_info parameter directly when the root is not
used otherwise")
71251
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/extent-tree.c
between commit:
b286384aac32 ("btrfs: root->fs_info cleanup, add fs_info convenience
variables")
[again, no commiter Signed-off-by]
from the btrfs-kdave tree and commit:
b3d3fa519905 ("btrfs:
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/disk-io.c
between commit:
b286384aac32 ("btrfs: root->fs_info cleanup, add fs_info convenience
variables")
26112f7f4726 ("btrfs: take an fs_info parameter directly when the root is not
used otherwise")
from
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/compression.c
between commit:
26112f7f4726 ("btrfs: take an fs_info parameter directly when the root is not
used otherwise")
[This commit has no Signed-off-by from its committer :-(]
d42b410c1511 ("Btrfs: fix
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/compression.c
between commit:
edf0e062aa6f ("Btrfs: fix BUG_ON in btrfs_submit_compressed_write")
from the btrfs-kdave tree and commit:
81a75f6781de ("btrfs: use bio fields for op and flags")
from the block
18 matches
Mail list logo
