diff for duplicates of <253818670505170339187ebecd@mail.gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index ae8d57b..f704a33 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,20 +5,3 @@ reference to the attribute when the callbacks are called.
 Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
 
 ---
--------------- next part --------------
- drivers/base/core.c    |    4 ++--
- include/linux/device.h |    5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff
-Type: text/x-patch
-Size: 1533 bytes
-Desc: not available
-Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20050517/2da59aa5/patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.bin
--------------- next part --------------
-_______________________________________________
-lm-sensors mailing list
-lm-sensors@lm-sensors.org
-http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
diff --git a/N1/2.hdr b/N1/2.hdr
new file mode 100644
index 0000000..5ac23be
--- /dev/null
+++ b/N1/2.hdr
@@ -0,0 +1,4 @@
+Content-Type: text/plain; 
+	name=patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff.diffstat.txt; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment; filename="patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff.diffstat.txt"
diff --git a/N1/2.txt b/N1/2.txt
new file mode 100644
index 0000000..4ba5247
--- /dev/null
+++ b/N1/2.txt
@@ -0,0 +1,3 @@
+ drivers/base/core.c    |    4 ++--
+ include/linux/device.h |    5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/N1/3.hdr b/N1/3.hdr
new file mode 100644
index 0000000..a4d9423
--- /dev/null
+++ b/N1/3.hdr
@@ -0,0 +1,4 @@
+Content-Type: text/x-patch; 
+	name=patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment; filename="patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff"
diff --git a/N1/3.txt b/N1/3.txt
new file mode 100644
index 0000000..14070e4
--- /dev/null
+++ b/N1/3.txt
@@ -0,0 +1,36 @@
+diff -uprN -X dontdiff linux-2.6.12-rc4/drivers/base/core.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/base/core.c
+--- linux-2.6.12-rc4/drivers/base/core.c	2005-05-07 03:37:15.000000000 -0400
++++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/base/core.c	2005-05-16 20:50:02.000000000 -0400
+@@ -41,7 +41,7 @@ dev_attr_show(struct kobject * kobj, str
+ 	ssize_t ret = 0;
+ 
+ 	if (dev_attr->show)
+-		ret = dev_attr->show(dev, buf);
++		ret = dev_attr->show(dev, dev_attr, buf);
+ 	return ret;
+ }
+ 
+@@ -54,7 +54,7 @@ dev_attr_store(struct kobject * kobj, st
+ 	ssize_t ret = 0;
+ 
+ 	if (dev_attr->store)
+-		ret = dev_attr->store(dev, buf, count);
++		ret = dev_attr->store(dev, dev_attr, buf, count);
+ 	return ret;
+ }
+ 
+diff -uprN -X dontdiff linux-2.6.12-rc4/include/linux/device.h linux-2.6.12-rc4-sysfsdyncallback-deviceattr/include/linux/device.h
+--- linux-2.6.12-rc4/include/linux/device.h	2005-05-07 03:37:24.000000000 -0400
++++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr/include/linux/device.h	2005-05-16 20:58:43.000000000 -0400
+@@ -335,8 +335,9 @@ extern void driver_attach(struct device_
+ 
+ struct device_attribute {
+ 	struct attribute	attr;
+-	ssize_t (*show)(struct device * dev, char * buf);
+-	ssize_t (*store)(struct device * dev, const char * buf, size_t count);
++	ssize_t (*show)(struct device * dev, struct device_attribute *attr, char * buf);
++	ssize_t (*store)(struct device * dev, struct device_attribute *attr, 
++			const char * buf, size_t count);
+ };
+ 
+ #define DEVICE_ATTR(_name,_mode,_show,_store) \
diff --git a/a/content_digest b/N1/content_digest
index 04bffd9..60d700f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,10 @@
- "From\0yani.ioannou@gmail.com (Yani Ioannou)\0"
- "Subject\0[lm-sensors] [PATCH 2.6.12-rc4 2/15] drivers/base/core.c,\0"
- "Date\0Thu, 19 May 2005 06:25:58 +0000\0"
+ "From\0Yani Ioannou <yani.ioannou@gmail.com>\0"
+ "Subject\0[PATCH 2.6.12-rc4 2/15] drivers/base/core.c, include/linux/device.h: change device_attribute callbacks\0"
+ "Date\0Tue, 17 May 2005 06:39:34 -0400\0"
  "To\0Greg KH <greg@kroah.com>"
   linux-kernel@vger.kernel.org
  " lm-sensors@lm-sensors.org\0"
- "\00:1\0"
+ "\01:1\0"
  "b\0"
  "This patch adds the device_attribute paramerter to the\n"
  "device_attribute store and show sysfs callback functions, and passes a\n"
@@ -12,23 +12,51 @@
  "\n"
  "Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>\n"
  "\n"
- "---\n"
- "-------------- next part --------------\n"
+ ---
+ "\01:2\0"
+ "fn\0patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff.diffstat.txt\0"
+ "b\0"
  " drivers/base/core.c    |    4 ++--\n"
  " include/linux/device.h |    5 +++--\n"
- " 2 files changed, 5 insertions(+), 4 deletions(-)\n"
- "\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff\n"
- "Type: text/x-patch\n"
- "Size: 1533 bytes\n"
- "Desc: not available\n"
- "Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20050517/2da59aa5/patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.bin\n"
- "-------------- next part --------------\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+  2 files changed, 5 insertions(+), 4 deletions(-)
+ "\01:3\0"
+ "fn\0patch-linux-2.6.12-rc4-sysfsdyncallback-deviceattr.diff\0"
+ "b\0"
+ "diff -uprN -X dontdiff linux-2.6.12-rc4/drivers/base/core.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/base/core.c\n"
+ "--- linux-2.6.12-rc4/drivers/base/core.c\t2005-05-07 03:37:15.000000000 -0400\n"
+ "+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/base/core.c\t2005-05-16 20:50:02.000000000 -0400\n"
+ "@@ -41,7 +41,7 @@ dev_attr_show(struct kobject * kobj, str\n"
+ " \tssize_t ret = 0;\n"
+ " \n"
+ " \tif (dev_attr->show)\n"
+ "-\t\tret = dev_attr->show(dev, buf);\n"
+ "+\t\tret = dev_attr->show(dev, dev_attr, buf);\n"
+ " \treturn ret;\n"
+ " }\n"
+ " \n"
+ "@@ -54,7 +54,7 @@ dev_attr_store(struct kobject * kobj, st\n"
+ " \tssize_t ret = 0;\n"
+ " \n"
+ " \tif (dev_attr->store)\n"
+ "-\t\tret = dev_attr->store(dev, buf, count);\n"
+ "+\t\tret = dev_attr->store(dev, dev_attr, buf, count);\n"
+ " \treturn ret;\n"
+ " }\n"
+ " \n"
+ "diff -uprN -X dontdiff linux-2.6.12-rc4/include/linux/device.h linux-2.6.12-rc4-sysfsdyncallback-deviceattr/include/linux/device.h\n"
+ "--- linux-2.6.12-rc4/include/linux/device.h\t2005-05-07 03:37:24.000000000 -0400\n"
+ "+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr/include/linux/device.h\t2005-05-16 20:58:43.000000000 -0400\n"
+ "@@ -335,8 +335,9 @@ extern void driver_attach(struct device_\n"
+ " \n"
+ " struct device_attribute {\n"
+ " \tstruct attribute\tattr;\n"
+ "-\tssize_t (*show)(struct device * dev, char * buf);\n"
+ "-\tssize_t (*store)(struct device * dev, const char * buf, size_t count);\n"
+ "+\tssize_t (*show)(struct device * dev, struct device_attribute *attr, char * buf);\n"
+ "+\tssize_t (*store)(struct device * dev, struct device_attribute *attr, \n"
+ "+\t\t\tconst char * buf, size_t count);\n"
+ " };\n"
+ " \n"
+ " #define DEVICE_ATTR(_name,_mode,_show,_store) \\"
 
-08f28a70d963ff0e3ab3874bea2a6e91de396f486006efec88445987d2def38e
+5ed0fe43e70a36f904f4eb3f5f228eadc88035538eb37b8fcab212a62034f92f
