Skip to contentSkip to conversation

linux-next conflict resolution branch for btrfs

DISCUSSION Chris Mason 2 participants 4 messages Aug 20, 2015 – Aug 21, 2015 Btrfs file system

lore
Share & tools
lore

Chris Mason

author
#0 lore raw

Hi Stephen,

There are a few conflicts for btrfs in linux-next this time. They are small, but I pushed out the merge commit I'm using here:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge

-chris

#1 lore raw

Hi Chris,

Quoted 5 lines · On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <[email protected]> wrote:

There are a few conflicts for btrfs in linux-next this time. They are small, but I pushed out the merge commit I'm using here:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge

Thanks for that. It seems to have merged OK but maybe it conflicts with something later in linux-next. Unfortunately see my other email about a build problem. I will keep this example merge in mind for later.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
author
#2 lore raw
Quoted 7 lines · Stephen Rothwell

Hi Chris,

Quoted 4 lines · On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <[email protected]> wrote:

There are a few conflicts for btrfs in linux-next this time. They are small, but I pushed out the merge commit I'm using here:

Quoted 6 lines
Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge

Thanks for that. It seems to have merged OK but maybe it conflicts with something later in linux-next. Unfortunately see my other email about a build problem. I will keep this example merge in mind for later.

Ok, sorry about that one. We probably want the ifdefs up in Tejun's code, but I'll talk with him about it today and get it fixed up.

Thanks,
Chris

author
#3 lore raw
In reply to Stephen Rothwell
Quoted 7 lines · Stephen Rothwell

Hi Chris,

Quoted 4 lines · On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <[email protected]> wrote:

There are a few conflicts for btrfs in linux-next this time. They are small, but I pushed out the merge commit I'm using here:

Quoted 6 lines
Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge

Thanks for that. It seems to have merged OK but maybe it conflicts with something later in linux-next. Unfortunately see my other email about a build problem. I will keep this example merge in mind for later.

Ok, I put the ifdefs in btrfs. Really what I need to do is change bio_clone to do this work, but that means making sure its the right thing for dm/md first.

I also added ifdefs for bio->bi_ioc in fs/btrfs/volumes.c, but another commit in linux-next actually deletes the whole function from btrfs. I've redone the example merge:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next-merge

-chris