* linux-next conflict resolution branch for btrfs
@ 2015-08-20 17:39 Chris Mason
2015-08-21 0:45 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Chris Mason @ 2015-08-20 17:39 UTC (permalink / raw)
To: linux-btrfs@vger.kernel.org, LKML, Stephen Rothwell
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next conflict resolution branch for btrfs
2015-08-20 17:39 linux-next conflict resolution branch for btrfs Chris Mason
@ 2015-08-21 0:45 ` Stephen Rothwell
2015-08-21 15:23 ` Chris Mason
2015-08-21 18:06 ` Chris Mason
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-08-21 0:45 UTC (permalink / raw)
To: Chris Mason; +Cc: linux-btrfs@vger.kernel.org, LKML
Hi Chris,
On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <clm@fb.com> 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next conflict resolution branch for btrfs
2015-08-21 0:45 ` Stephen Rothwell
@ 2015-08-21 15:23 ` Chris Mason
2015-08-21 18:06 ` Chris Mason
1 sibling, 0 replies; 4+ messages in thread
From: Chris Mason @ 2015-08-21 15:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-btrfs@vger.kernel.org, LKML
On Fri, Aug 21, 2015 at 10:45:24AM +1000, Stephen Rothwell wrote:
> Hi Chris,
>
> On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <clm@fb.com> 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.
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next conflict resolution branch for btrfs
2015-08-21 0:45 ` Stephen Rothwell
2015-08-21 15:23 ` Chris Mason
@ 2015-08-21 18:06 ` Chris Mason
1 sibling, 0 replies; 4+ messages in thread
From: Chris Mason @ 2015-08-21 18:06 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-btrfs@vger.kernel.org, LKML
On Fri, Aug 21, 2015 at 10:45:24AM +1000, Stephen Rothwell wrote:
> Hi Chris,
>
> On Thu, 20 Aug 2015 13:39:18 -0400 Chris Mason <clm@fb.com> 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.
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-21 18:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-20 17:39 linux-next conflict resolution branch for btrfs Chris Mason
2015-08-21 0:45 ` Stephen Rothwell
2015-08-21 15:23 ` Chris Mason
2015-08-21 18:06 ` Chris Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).