diff for duplicates of <200504210213.57219.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index c3e4e78..9c56b7f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 7 files changed, 160 insertions(+), 208 deletions(-) Index: dtor/drivers/w1/ds_w1_bridge.c -=================================--- dtor.orig/drivers/w1/ds_w1_bridge.c +=================================================================== +--- dtor.orig/drivers/w1/ds_w1_bridge.c +++ dtor/drivers/w1/ds_w1_bridge.c @@ -27,12 +27,12 @@ #include "dscore.h" @@ -202,7 +203,8 @@ Index: dtor/drivers/w1/ds_w1_bridge.c module_init(ds_w1_init); Index: dtor/drivers/w1/w1_int.c -=================================--- dtor.orig/drivers/w1/w1_int.c +=================================================================== +--- dtor.orig/drivers/w1/w1_int.c +++ dtor/drivers/w1/w1_int.c @@ -39,16 +39,14 @@ extern spinlock_t w1_mlock; @@ -355,7 +357,7 @@ Index: dtor/drivers/w1/w1_int.c - struct w1_master *dev; - - list_for_each_entry(dev, &w1_masters, node) -- if (dev->initialized && dev->bus_master->data = bm->data) { +- if (dev->initialized && dev->bus_master->data == bm->data) { - __w1_remove_master_device(dev); - break; - } @@ -367,7 +369,8 @@ Index: dtor/drivers/w1/w1_int.c EXPORT_SYMBOL(w1_add_master_device); EXPORT_SYMBOL(w1_remove_master_device); Index: dtor/drivers/w1/matrox_w1.c -=================================--- dtor.orig/drivers/w1/matrox_w1.c +=================================================================== +--- dtor.orig/drivers/w1/matrox_w1.c +++ dtor/drivers/w1/matrox_w1.c @@ -85,14 +85,10 @@ struct matrox_device @@ -509,7 +512,8 @@ Index: dtor/drivers/w1/matrox_w1.c } Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -125,7 +125,7 @@ static ssize_t w1_master_attribute_show_ if (down_interruptible(&md->mutex)) @@ -531,7 +535,7 @@ Index: dtor/drivers/w1/w1.c - - spin_lock_irq(&w1_mlock); - list_for_each_entry(master, &w1_masters, node) { -- if (master->bus_master->data = data) { +- if (master->bus_master->data == data) { - found = 1; - atomic_inc(&master->refcnt); - break; @@ -588,7 +592,8 @@ Index: dtor/drivers/w1/w1.c control_needs_exit = 1; Index: dtor/drivers/w1/w1_io.c -=================================--- dtor.orig/drivers/w1/w1_io.c +=================================================================== +--- dtor.orig/drivers/w1/w1_io.c +++ dtor/drivers/w1/w1_io.c @@ -13,7 +13,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -730,7 +735,8 @@ Index: dtor/drivers/w1/w1_io.c w1_search(dev); } Index: dtor/drivers/w1/w1_int.h -=================================--- dtor.orig/drivers/w1/w1_int.h +=================================================================== +--- dtor.orig/drivers/w1/w1_int.h +++ dtor/drivers/w1/w1_int.h @@ -24,13 +24,13 @@ @@ -751,7 +757,8 @@ Index: dtor/drivers/w1/w1_int.h #endif /* __W1_INT_H */ Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -82,26 +82,25 @@ struct w1_slave }; diff --git a/a/content_digest b/N1/content_digest index 88e1216..b73dffa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200504210207.02421.dtor_core@ameritech.net\0" - "From\0dtor_core@ameritech.net (Dmitry Torokhov)\0" + "From\0Dmitry Torokhov <dtor_core@ameritech.net>\0" "Subject\0[RFC/PATCH 7/22] W1: bus operations cleanup\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:13:56 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -31,7 +31,8 @@ " 7 files changed, 160 insertions(+), 208 deletions(-)\n" "\n" "Index: dtor/drivers/w1/ds_w1_bridge.c\n" - "=================================--- dtor.orig/drivers/w1/ds_w1_bridge.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/ds_w1_bridge.c\n" "+++ dtor/drivers/w1/ds_w1_bridge.c\n" "@@ -27,12 +27,12 @@\n" " #include \"dscore.h\"\n" @@ -212,7 +213,8 @@ " \n" " module_init(ds_w1_init);\n" "Index: dtor/drivers/w1/w1_int.c\n" - "=================================--- dtor.orig/drivers/w1/w1_int.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_int.c\n" "+++ dtor/drivers/w1/w1_int.c\n" "@@ -39,16 +39,14 @@ extern spinlock_t w1_mlock;\n" " \n" @@ -365,7 +367,7 @@ "-\tstruct w1_master *dev;\n" "-\n" "-\tlist_for_each_entry(dev, &w1_masters, node)\n" - "-\t\tif (dev->initialized && dev->bus_master->data = bm->data) {\n" + "-\t\tif (dev->initialized && dev->bus_master->data == bm->data) {\n" "-\t\t\t__w1_remove_master_device(dev);\n" "-\t\t\tbreak;\n" "-\t\t}\n" @@ -377,7 +379,8 @@ " EXPORT_SYMBOL(w1_add_master_device);\n" " EXPORT_SYMBOL(w1_remove_master_device);\n" "Index: dtor/drivers/w1/matrox_w1.c\n" - "=================================--- dtor.orig/drivers/w1/matrox_w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/matrox_w1.c\n" "+++ dtor/drivers/w1/matrox_w1.c\n" "@@ -85,14 +85,10 @@ struct matrox_device\n" " \n" @@ -519,7 +522,8 @@ " }\n" " \n" "Index: dtor/drivers/w1/w1.c\n" - "=================================--- dtor.orig/drivers/w1/w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.c\n" "+++ dtor/drivers/w1/w1.c\n" "@@ -125,7 +125,7 @@ static ssize_t w1_master_attribute_show_\n" " \tif (down_interruptible(&md->mutex))\n" @@ -541,7 +545,7 @@ "-\n" "-\tspin_lock_irq(&w1_mlock);\n" "-\tlist_for_each_entry(master, &w1_masters, node) {\n" - "-\t\tif (master->bus_master->data = data) {\n" + "-\t\tif (master->bus_master->data == data) {\n" "-\t\t\tfound = 1;\n" "-\t\t\tatomic_inc(&master->refcnt);\n" "-\t\t\tbreak;\n" @@ -598,7 +602,8 @@ " \tcontrol_needs_exit = 1;\n" " \n" "Index: dtor/drivers/w1/w1_io.c\n" - "=================================--- dtor.orig/drivers/w1/w1_io.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_io.c\n" "+++ dtor/drivers/w1/w1_io.c\n" "@@ -13,7 +13,7 @@\n" " * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" @@ -740,7 +745,8 @@ " \t\tw1_search(dev);\n" " }\n" "Index: dtor/drivers/w1/w1_int.h\n" - "=================================--- dtor.orig/drivers/w1/w1_int.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_int.h\n" "+++ dtor/drivers/w1/w1_int.h\n" "@@ -24,13 +24,13 @@\n" " \n" @@ -761,7 +767,8 @@ " \n" " #endif /* __W1_INT_H */\n" "Index: dtor/drivers/w1/w1.h\n" - "=================================--- dtor.orig/drivers/w1/w1.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.h\n" "+++ dtor/drivers/w1/w1.h\n" "@@ -82,26 +82,25 @@ struct w1_slave\n" " };\n" @@ -822,4 +829,4 @@ " \tu32\t\t\tseq, groups;\n" " \tstruct sock\t\t*nls;" -224740c582bec7729dc00a3e7a1a7a6a73b3bed7411902b211b55e66b8f9eb30 +ab00cab41600d4147b6ae2b16eb0495df2e188e8ba938125261cb1f28447cabb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.