---

yaml
---
r: 107594
b: refs/heads/master
c: daf423d
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2acb802b0c5485aedb46e23b2b45e49573454c09
+refs/heads/master: daf423db3b6afd90ecdd776dbc32c0b57cc78edb

trunk/Documentation/DocBook/kgdb.tmpl

@@ -98,24 +98,6 @@
     "Kernel debugging" select "KGDB: kernel debugging with remote gdb".
     </para>
     <para>
-    It is advised, but not required that you turn on the
-    CONFIG_FRAME_POINTER kernel option.  This option inserts code to
-    into the compiled executable which saves the frame information in
-    registers or on the stack at different points which will allow a
-    debugger such as gdb to more accurately construct stack back traces
-    while debugging the kernel.
-    </para>
-    <para>
-    If the architecture that you are using supports the kernel option
-    CONFIG_DEBUG_RODATA, you should consider turning it off.  This
-    option will prevent the use of software breakpoints because it
-    marks certain regions of the kernel's memory space as read-only.
-    If kgdb supports it for the architecture you are using, you can
-    use hardware breakpoints if you desire to run with the
-    CONFIG_DEBUG_RODATA option turned on, else you need to turn off
-    this option.
-    </para>
-    <para>
     Next you should choose one of more I/O drivers to interconnect debugging
     host and debugged target.  Early boot debugging requires a KGDB
     I/O driver that supports early debugging and the driver must be

trunk/Documentation/filesystems/configfs/configfs.txt

@@ -311,20 +311,9 @@ the subsystem must be ready for it.
 [An Example]
 
 The best example of these basic concepts is the simple_children
-subsystem/group and the simple_child item in configfs_example_explicit.c
-and configfs_example_macros.c.  It shows a trivial object displaying and
-storing an attribute, and a simple group creating and destroying these
-children.
-
-The only difference between configfs_example_explicit.c and
-configfs_example_macros.c is how the attributes of the childless item
-are defined.  The childless item has extended attributes, each with
-their own show()/store() operation.  This follows a convention commonly
-used in sysfs.  configfs_example_explicit.c creates these attributes
-by explicitly defining the structures involved.  Conversely
-configfs_example_macros.c uses some convenience macros from configfs.h
-to define the attributes.  These macros are similar to their sysfs
-counterparts.
+subsystem/group and the simple_child item in configfs_example.c  It
+shows a trivial object displaying and storing an attribute, and a simple
+group creating and destroying these children.
 
 [Hierarchy Navigation and the Subsystem Mutex]
 

trunk/Documentation/filesystems/configfs/configfs_example_explicit.c → trunk/Documentation/filesystems/configfs/configfs_example.c

@@ -1,10 +1,8 @@
 /*
  * vim: noexpandtab ts=8 sts=0 sw=8:
  *
- * configfs_example_explicit.c - This file is a demonstration module
- *      containing a number of configfs subsystems.  It explicitly defines
- *      each structure without using the helper macros defined in
- *      configfs.h.
+ * configfs_example.c - This file is a demonstration module containing
+ *      a number of configfs subsystems.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -283,6 +281,7 @@ static struct config_item *simple_children_make_item(struct config_group *group,
 	if (!simple_child)
 		return ERR_PTR(-ENOMEM);
 
+
 	config_item_init_type_name(&simple_child->item, name,
 				   &simple_child_type);
 
@@ -303,8 +302,8 @@ static struct configfs_attribute *simple_children_attrs[] = {
 };
 
 static ssize_t simple_children_attr_show(struct config_item *item,
-					 struct configfs_attribute *attr,
-					 char *page)
+			   		 struct configfs_attribute *attr,
+			   		 char *page)
 {
 	return sprintf(page,
 "[02-simple-children]\n"
@@ -319,7 +318,7 @@ static void simple_children_release(struct config_item *item)
 }
 
 static struct configfs_item_operations simple_children_item_ops = {
-	.release	= simple_children_release,
+	.release 	= simple_children_release,
 	.show_attribute	= simple_children_attr_show,
 };
 
@@ -369,6 +368,7 @@ static struct config_group *group_children_make_group(struct config_group *group
 	if (!simple_children)
 		return ERR_PTR(-ENOMEM);
 
+
 	config_group_init_type_name(&simple_children->group, name,
 				    &simple_children_type);
 
@@ -387,8 +387,8 @@ static struct configfs_attribute *group_children_attrs[] = {
 };
 
 static ssize_t group_children_attr_show(struct config_item *item,
-					struct configfs_attribute *attr,
-					char *page)
+			   		struct configfs_attribute *attr,
+			   		char *page)
 {
 	return sprintf(page,
 "[03-group-children]\n"