Re: linux-next: manual merge of the vfs tree with the ceph tree

[Ilya Dryomov]

On Fri, Jun 26, 2015 at 4:17 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
>   fs/ceph/dir.c
>
> between commit:
>
>   fdd4e15838e5 ("ceph: rework dcache readdir")
>
> from the ceph tree and commit:
>
>   dc3f4198eac1 ("make simple_positive() public")
>
> from the vfs tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary (no action
> is required).
>
> Sage: that ceph tree commit has no Signed-off-by from its
> committer :-(  The same is true for almost all the commits in the ceph
> tree ... and the committer (Ilya) is not listed as a maintainer of that
> tree ... and its on github :-(

Well, it has Signed-off-by from a person who is listed as a maintainer
of fs/ceph (Zheng).  We share the same tree for three components: rbd
(drivers/block/rbd.c), cephfs (fs/ceph) and libceph (net/ceph) which is
used by both rbd and cephfs (we should probably split libceph into its
own MAINTAINERS entry).  The volume of commits is not that high and
we prefer to not clutter our 30-40 commits per cycle with a bunch of
merges, so when one of us rebases the committer stamp gets wiped.

As for github, is that a bad thing?  ceph-client.git is certainly not
the only github tree in linux-next.

Thanks,

                Ilya
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/