lkml.org 
[lkml]   [2010]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the ceph tree with Linus' tree
Thanks, Stephen.

I've rebased my for-next on the latest upstream (now that lock_flocks() is
in place), so these should all go away the next time around.

sage


On Thu, 23 Sep 2010, Stephen Rothwell wrote:

> Hi Sage,
>
> Today's linux-next merge of the ceph tree got a conflict in
> fs/ceph/Kconfig between commit be4f104dfd3b5e3ae262bff607965cfc38027dec
> ("ceph: select CRYPTO") from Linus' tree and commit
> 49dde0c8bee346a349862c4a3eddcd58e0d0ae90 ("ceph: factor out libceph from
> Ceph file system") from the ceph tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix for a while. (though the adding of "default n" is, I think,
> redundant as that is the default anyway).
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc fs/ceph/Kconfig
> index 0fcd264,73a7b31..0000000
> --- a/fs/ceph/Kconfig
> +++ b/fs/ceph/Kconfig
> @@@ -1,9 -1,10 +1,11 @@@
> config CEPH_FS
> tristate "Ceph distributed file system (EXPERIMENTAL)"
> depends on INET && EXPERIMENTAL
> + select CEPH_LIB
> select LIBCRC32C
> select CRYPTO_AES
> + select CRYPTO
> + default n
> help
> Choose Y or M here to include support for mounting the
> experimental Ceph distributed file system. Ceph is an extremely
>
>


\
 
 \ /
  Last update: 2010-09-23 05:37    [W:2.314 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site