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@xxxxxxxxxxxxxxxx>
Subject: trivial: fix typos/grammar errors in fs/Kconfig
Signed-off-by: Matt LaPlante <kernel1@xxxxxxxxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
