Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ceph/super.c
between commit:
8e4133936f30 ("ceph: auto reconnect after blacklisted")
from the ceph tree and commit:
d91c9998290b ("vfs: Convert ceph to use the new mount API")
from the vfs tree.
I fixed it up (Than
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ceph/super.c
between commit:
8e4133936f30 ("ceph: auto reconnect after blacklisted")
from the ceph tree and commit:
108f95bfaa56 ("vfs: Convert ceph to use the new mount API")
from the vfs tree.
I fixed it up (see
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ceph/file.c
between commit:
fce7a9744bdf ("ceph: refactor ceph_sync_read()")
from the ceph tree and commit:
00e23707442a ("iov_iter: Use accessor function")
from the vfs tree.
I fixed it up (see below) and can carry
Hi Ilya,
On Fri, 26 Jun 2015 11:21:52 +0300 Ilya Dryomov wrote:
>
> > 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 i
On Fri, Jun 26, 2015 at 4:17 AM, Stephen Rothwell 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(
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 ca
6 matches
Mail list logo
