* linux-next: manual merge of the trivial tree with the quota tree
@ 2009-02-10 7:34 Stephen Rothwell
2009-02-10 9:42 ` Jiri Kosina
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-02-10 7:34 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, Jan Kara
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
Hi Jiri,
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.
I have just dropped the trivial tree's updates. Jiri, please separate
out the fs/Kconfig part of that trivial tree commit above and sent it to
Jan.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the trivial tree with the quota tree
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
0 siblings, 2 replies; 4+ messages in thread
From: Jiri Kosina @ 2009-02-10 9:42 UTC (permalink / raw)
To: Stephen Rothwell, Jan Kara; +Cc: linux-next
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?
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the trivial tree with the quota tree
2009-02-10 9:42 ` Jiri Kosina
@ 2009-02-10 11:09 ` Stephen Rothwell
2009-02-10 13:52 ` Jan Kara
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2009-02-10 11:09 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Jan Kara, linux-next
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
Hi Jiri,
On Tue, 10 Feb 2009 10:42:17 +0100 (CET) Jiri Kosina <jkosina@suse•cz> wrote:
>
> 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?
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the quota tree
2009-02-10 9:42 ` Jiri Kosina
2009-02-10 11:09 ` Stephen Rothwell
@ 2009-02-10 13:52 ` Jan Kara
1 sibling, 0 replies; 4+ messages in thread
From: Jan Kara @ 2009-02-10 13:52 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Stephen Rothwell, linux-next
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-02-10 17:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox