On Thu, Sep 19, 2019 at 12:31:06PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the btrfs-kdave tree got conflicts in:
>
> fs/btrfs/block-group.c
> fs/btrfs/ctree.h
> fs/btrfs/extent-tree.c
> fs/btrfs/send.c
> fs/btrfs/space-info.c
> include/uapi/linux/btrfs_tree
Hi all,
Today's linux-next merge of the btrfs-kdave tree got conflicts in:
fs/btrfs/block-group.c
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/send.c
fs/btrfs/space-info.c
include/uapi/linux/btrfs_tree.h
between a number of commits in Linus' tree and a number of commits in
the bt
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/tree-log.c
between commit:
c7f88c4e78f5 ("btrfs: convert to new i_version API")
from Linus' tree and commit:
8bd2a9b19fd7 ("btrfs: Remove custom crc32c init code")
from the btrfs-kdave tree.
I fixed
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/disk-io.c
between commit:
540adea3809f ("error-injection: Separate error-injection from kprobe")
from Linus' tree and commit:
8bd2a9b19fd7 ("btrfs: Remove custom crc32c init code")
from the btrfs-kda
Hi all,
On Fri, 25 Aug 2017 09:58:25 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the btrfs-kdave tree got a conflict in:
>
> fs/btrfs/inode.c
>
> between commit:
>
> 58efbc9f5463 ("Btrfs: fix blk_status_t/errno confusion")
>
> from Linus' tree and commit:
>
> e6961ca
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/inode.c
between commit:
58efbc9f5463 ("Btrfs: fix blk_status_t/errno confusion")
from Linus' tree and commit:
e6961cac730f ("btrfs: Move skip checksum check from btrfs_submit_direct to
__btrfs_submit
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/scrub.c
between commit:
4e4cbee93d56 ("block: switch bios to blk_status_t")
from Linus' tree and commit:
26397a4ad1d5 ("btrfs: account that we're waiting for IO in
scrub_submit_raid56_bio_wait")
fro
On Tue, Jul 18, 2017 at 10:18:02AM +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the btrfs-kdave tree got a conflict in:
>
> fs/btrfs/extent_io.c
>
> between commit:
>
> e6959b9350c6 ("btrfs: add support for passing in write hints for buffered
> writes")
>
> f
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/extent_io.c
between commit:
e6959b9350c6 ("btrfs: add support for passing in write hints for buffered
writes")
from Linus' tree and commit:
41a3f2a7c062 ("btrfs: merge REQ_OP and REQ_ flags to one pa
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/inode.c
between commit:
70fd76140a6c ("block,fs: use REQ_* flags directly")
from Linus' tree and commit:
da17066c4047 ("btrfs: pull node/sector/stripe sizes out of root and into
fs_info")
from the b
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/send.c
between commit:
3dc09ec895f0 ("Btrfs: kill invalid ASSERT() in process_all_refs()")
from Linus' tree and commit:
8e991cbbea49 ("Btrfs: handle pending renames with recycled inodes properly")
fr
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/volumes.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}
macros")
from Linus' tree and commit:
b54a17371a08 ("btrfs: create a helper function to read the
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/file.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}
macros")
from Linus' tree and commit:
201c5fdc44d7 ("Btrfs: don't do nocow check unless we have to")
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/extent_io.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}
macros")
from Linus' tree and commit:
a7424783a24d ("Btrfs: make mapping->writeback_index point
On Tuesday 02 Feb 2016 10:22:16 Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the btrfs-kdave tree got a conflict in:
>
> fs/btrfs/file.c
>
> between commit:
>
> 5955102c9984 ("wrappers for ->i_mutex access")
>
> from Linus' tree and commit:
>
> 9703fefe0b13 ("Btrf
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/file.c
between commit:
5955102c9984 ("wrappers for ->i_mutex access")
from Linus' tree and commit:
9703fefe0b13 ("Btrfs: fallocate: Work with sectorsized blocks")
from the btrfs-kdave tree.
I fixed
16 matches
Mail list logo
