From: Sage Weil <sage@newdream.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree
Date: Wed, 22 Sep 2010 20:36:52 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.1009222036210.14012@cobra.newdream.net> (raw)
In-Reply-To: <20100923102924.25db6970.sfr@canb.auug.org.au>
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
>
>
next prev parent reply other threads:[~2010-09-23 3:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-23 0:29 linux-next: manual merge of the ceph tree with Linus' tree Stephen Rothwell
2010-09-23 3:36 ` Sage Weil [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-05 22:24 Stephen Rothwell
2013-07-10 1:24 Stephen Rothwell
2013-07-10 3:57 ` Sage Weil
2013-06-19 1:22 Stephen Rothwell
2013-04-18 1:34 Stephen Rothwell
2012-07-31 1:58 Stephen Rothwell
2012-07-21 23:16 Stephen Rothwell
2012-05-22 1:45 Stephen Rothwell
2012-05-22 3:58 ` Sage Weil
2012-03-21 1:23 Stephen Rothwell
2012-01-11 1:27 Stephen Rothwell
2012-01-11 1:31 ` Al Viro
2012-01-11 1:35 ` Sage Weil
2012-01-11 1:49 ` Al Viro
2012-01-11 3:02 ` Stephen Rothwell
2012-01-11 2:10 ` Alex Elder
2010-12-15 0:14 Stephen Rothwell
2010-09-23 1:04 Stephen Rothwell
2010-09-23 0:56 Stephen Rothwell
2010-08-13 0:28 Stephen Rothwell
2010-05-14 0:07 Stephen Rothwell
2010-05-14 0:07 Stephen Rothwell
2010-05-14 0:07 Stephen Rothwell
2010-05-14 4:25 ` Sage Weil
2010-05-14 6:00 ` Stephen Rothwell
2010-01-12 0:09 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1009222036210.14012@cobra.newdream.net \
--to=sage@newdream.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).