From: Jan Kara <jack@suse•cz>
To: Jiri Kosina <jkosina@suse•cz>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>, linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the trivial tree with the quota tree
Date: Tue, 10 Feb 2009 14:52:19 +0100 [thread overview]
Message-ID: <20090210135219.GA10904@placka.suse.cz> (raw)
In-Reply-To: <alpine.LNX.1.10.0902101039520.11630@jikos.suse.cz>
On Tue 10-02-09 10:42:17, Jiri Kosina wrote:
> On Tue, 10 Feb 2009, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the trivial tree got a conflict in fs/Kconfig
> > between commit c417122fec0f6b10a6c338c84180c6b9e06601c8 ("quota: Move
> > quota files into separate directory") from the quota tree and commit
> > 8310459012b926e121b3546bfed833910dd6f3ef ("trivial: fix typos/grammar
> > errors in Kconfig texts") from the trivial tree.
>
> Thanks for notification Stephen. I have dropped the conflicting hunk from
> my tree now. Jan, could you please take the patch below through your tree?
Merged into quota tree. Thanks.
> From: Matt LaPlante <kernel1@cyberdogtech•com>
> Subject: trivial: fix typos/grammar errors in fs/Kconfig
>
> Signed-off-by: Matt LaPlante <kernel1@cyberdogtech•com>
> Acked-by: Randy Dunlap <randy.dunlap@oracle•com>
> Signed-off-by: Jiri Kosina <jkosina@suse•cz>
>
> diff --git a/fs/Kconfig b/fs/Kconfig
> index 93945dd..951b310 100644
> --- a/fs/Kconfig
> +++ b/fs/Kconfig
> @@ -87,7 +87,7 @@ config PRINT_QUOTA_WARNING
> Note that this behavior is currently deprecated and may go away in
> future. Please use notification via netlink socket instead.
>
> -# Generic support for tree structured quota files. Seleted when needed.
> +# Generic support for tree structured quota files. Selected when needed.
> config QUOTA_TREE
> tristate
Honza
prev parent reply other threads:[~2009-02-10 17:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 7:34 linux-next: manual merge of the trivial tree with the quota tree Stephen Rothwell
2009-02-10 9:42 ` Jiri Kosina
2009-02-10 11:09 ` Stephen Rothwell
2009-02-10 13:52 ` Jan Kara [this message]
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=20090210135219.GA10904@placka.suse.cz \
--to=jack@suse$(echo .)cz \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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