Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1210646 > unrolled thread
| Started by | Chris Mason <clm@fb.com> |
|---|---|
| First post | 2015-08-20 19:40 +0200 |
| Last post | 2015-08-21 20:10 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
linux-next conflict resolution branch for btrfs Chris Mason <clm@fb.com> - 2015-08-20 19:40 +0200
Re: linux-next conflict resolution branch for btrfs Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-21 02:50 +0200
Re: linux-next conflict resolution branch for btrfs Chris Mason <clm@fb.com> - 2015-08-21 17:30 +0200
Re: linux-next conflict resolution branch for btrfs Chris Mason <clm@fb.com> - 2015-08-21 20:10 +0200
| From | Chris Mason <clm@fb.com> |
|---|---|
| Date | 2015-08-20 19:40 +0200 |
| Subject | linux-next conflict resolution branch for btrfs |
| Message-ID | <pZBYK-3iA-15@gated-at.bofh.it> |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-21 02:50 +0200 |
| Message-ID | <pZIGS-4zi-5@gated-at.bofh.it> |
| In reply to | #1210646 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Chris Mason <clm@fb.com> |
|---|---|
| Date | 2015-08-21 17:30 +0200 |
| Message-ID | <pZWqu-7Av-13@gated-at.bofh.it> |
| In reply to | #1210814 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Chris Mason <clm@fb.com> |
|---|---|
| Date | 2015-08-21 20:10 +0200 |
| Message-ID | <pZYVj-2PK-3@gated-at.bofh.it> |
| In reply to | #1210814 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web