diff for duplicates of <1374129984-765-2-git-send-email-kishon@ti.com>
diff --git a/a/content_digest b/N1/content_digest
index 60de62f..a3df01a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,32 +11,32 @@
"Date\0Thu, 18 Jul 2013 12:16:10 +0530\0"
]
[
- "To\0<gregkh\@linuxfoundation.org>",
- " <kyungmin.park\@samsung.com>",
- " <balbi\@ti.com>",
- " <kishon\@ti.com>",
- " <jg1.han\@samsung.com>",
- " <s.nawrocki\@samsung.com>",
- " <kgene.kim\@samsung.com>\0"
+ "To\0gregkh\@linuxfoundation.org",
+ " kyungmin.park\@samsung.com",
+ " balbi\@ti.com",
+ " kishon\@ti.com",
+ " jg1.han\@samsung.com",
+ " s.nawrocki\@samsung.com",
+ " kgene.kim\@samsung.com\0"
]
[
- "Cc\0<grant.likely\@linaro.org>",
- " <tony\@atomide.com>",
- " <arnd\@arndb.de>",
- " <swarren\@nvidia.com>",
- " <devicetree-discuss\@lists.ozlabs.org>",
- " <linux-doc\@vger.kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <linux-samsung-soc\@vger.kernel.org>",
- " <linux-omap\@vger.kernel.org>",
- " <linux-usb\@vger.kernel.org>",
- " <linux-media\@vger.kernel.org>",
- " <linux-fbdev\@vger.kernel.org>",
- " <akpm\@linux-foundation.org>",
- " <balajitk\@ti.com>",
- " <george.cherian\@ti.com>",
- " <nsekhar\@ti.com>\0"
+ "Cc\0grant.likely\@linaro.org",
+ " tony\@atomide.com",
+ " arnd\@arndb.de",
+ " swarren\@nvidia.com",
+ " devicetree-discuss\@lists.ozlabs.org",
+ " linux-doc\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-samsung-soc\@vger.kernel.org",
+ " linux-omap\@vger.kernel.org",
+ " linux-usb\@vger.kernel.org",
+ " linux-media\@vger.kernel.org",
+ " linux-fbdev\@vger.kernel.org",
+ " akpm\@linux-foundation.org",
+ " balajitk\@ti.com",
+ " george.cherian\@ti.com",
+ " nsekhar\@ti.com\0"
]
[
"\0000:1\0"
@@ -1261,4 +1261,4 @@
"1.7.10.4"
]
-cdfa399638cfc0c3a472aec25c1da23ee58b8ca527d0aef5274bb51f2623be73
+c53cf46dc7fc3e69b2432a3e20975e2ee6b00ff22d3145741fb51b6040831eaa
diff --git a/a/1.txt b/N2/1.txt
index 3be5257..762dbdb 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -41,8 +41,7 @@ index 0000000..8ae844f
+information about PHY subsystem refer to Documentation/phy.txt
+
+PHY device node
-+===============
-+
++=======+
+Required Properties:
+#phy-cells: Number of cells in a PHY specifier; The meaning of all those
+ cells is defined by the binding for the phy node. The PHY
@@ -66,8 +65,7 @@ index 0000000..8ae844f
+given while trying to get a reference to it.
+
+PHY user node
-+=============
-+
++======+
+Required Properties:
+phys : the phandle for the PHY device (used by the PHY subsystem)
+phy-names : the names of the PHY corresponding to the PHYs present in the
@@ -374,7 +372,7 @@ index 0000000..6c75dc3
+
+static int devm_phy_match(struct device *dev, void *res, void *match_data)
+{
-+ return res == match_data;
++ return res = match_data;
+}
+
+static struct phy *phy_lookup(const char *phy_name)
@@ -402,7 +400,7 @@ index 0000000..6c75dc3
+ struct phy_provider *phy_provider;
+
+ list_for_each_entry(phy_provider, &phy_provider_list, list) {
-+ if (phy_provider->dev->of_node == node)
++ if (phy_provider->dev->of_node = node)
+ return phy_provider;
+ }
+
@@ -532,7 +530,7 @@ index 0000000..6c75dc3
+ int index = 0;
+ struct phy *phy = NULL;
+
-+ if (string == NULL) {
++ if (string = NULL) {
+ dev_WARN(dev, "missing string\n");
+ return ERR_PTR(-EINVAL);
+ }
@@ -1129,7 +1127,7 @@ index 0000000..9351a16
+ return ret;
+
+ mutex_lock(&phy->mutex);
-+ if (phy->init_count++ == 0 && phy->ops->init) {
++ if (phy->init_count++ = 0 && phy->ops->init) {
+ ret = phy->ops->init(phy);
+ if (ret < 0) {
+ dev_err(&phy->dev, "phy init failed --> %d\n", ret);
@@ -1152,7 +1150,7 @@ index 0000000..9351a16
+ return ret;
+
+ mutex_lock(&phy->mutex);
-+ if (--phy->init_count == 0 && phy->ops->exit) {
++ if (--phy->init_count = 0 && phy->ops->exit) {
+ ret = phy->ops->exit(phy);
+ if (ret < 0) {
+ dev_err(&phy->dev, "phy exit failed --> %d\n", ret);
@@ -1175,7 +1173,7 @@ index 0000000..9351a16
+ return ret;
+
+ mutex_lock(&phy->mutex);
-+ if (phy->power_count++ == 0 && phy->ops->power_on) {
++ if (phy->power_count++ = 0 && phy->ops->power_on) {
+ ret = phy->ops->power_on(phy);
+ if (ret < 0) {
+ dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);
@@ -1194,7 +1192,7 @@ index 0000000..9351a16
+ int ret = -ENOTSUPP;
+
+ mutex_lock(&phy->mutex);
-+ if (--phy->power_count == 0 && phy->ops->power_off) {
++ if (--phy->power_count = 0 && phy->ops->power_off) {
+ ret = phy->ops->power_off(phy);
+ if (ret < 0) {
+ dev_err(&phy->dev, "phy poweroff failed --> %d\n", ret);
diff --git a/a/content_digest b/N2/content_digest
index 60de62f..77e9338 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,35 +8,10 @@
"Subject\0[PATCH 01/15] drivers: phy: add generic PHY framework\0"
]
[
- "Date\0Thu, 18 Jul 2013 12:16:10 +0530\0"
+ "Date\0Thu, 18 Jul 2013 06:58:10 +0000\0"
]
[
- "To\0<gregkh\@linuxfoundation.org>",
- " <kyungmin.park\@samsung.com>",
- " <balbi\@ti.com>",
- " <kishon\@ti.com>",
- " <jg1.han\@samsung.com>",
- " <s.nawrocki\@samsung.com>",
- " <kgene.kim\@samsung.com>\0"
-]
-[
- "Cc\0<grant.likely\@linaro.org>",
- " <tony\@atomide.com>",
- " <arnd\@arndb.de>",
- " <swarren\@nvidia.com>",
- " <devicetree-discuss\@lists.ozlabs.org>",
- " <linux-doc\@vger.kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <linux-samsung-soc\@vger.kernel.org>",
- " <linux-omap\@vger.kernel.org>",
- " <linux-usb\@vger.kernel.org>",
- " <linux-media\@vger.kernel.org>",
- " <linux-fbdev\@vger.kernel.org>",
- " <akpm\@linux-foundation.org>",
- " <balajitk\@ti.com>",
- " <george.cherian\@ti.com>",
- " <nsekhar\@ti.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -88,8 +63,7 @@
"+information about PHY subsystem refer to Documentation/phy.txt\n",
"+\n",
"+PHY device node\n",
- "+===============\n",
- "+\n",
+ "+=======+\n",
"+Required Properties:\n",
"+#phy-cells:\tNumber of cells in a PHY specifier; The meaning of all those\n",
"+\t\tcells is defined by the binding for the phy node. The PHY\n",
@@ -113,8 +87,7 @@
"+given while trying to get a reference to it.\n",
"+\n",
"+PHY user node\n",
- "+=============\n",
- "+\n",
+ "+======+\n",
"+Required Properties:\n",
"+phys : the phandle for the PHY device (used by the PHY subsystem)\n",
"+phy-names : the names of the PHY corresponding to the PHYs present in the\n",
@@ -421,7 +394,7 @@
"+\n",
"+static int devm_phy_match(struct device *dev, void *res, void *match_data)\n",
"+{\n",
- "+\treturn res == match_data;\n",
+ "+\treturn res = match_data;\n",
"+}\n",
"+\n",
"+static struct phy *phy_lookup(const char *phy_name)\n",
@@ -449,7 +422,7 @@
"+\tstruct phy_provider *phy_provider;\n",
"+\n",
"+\tlist_for_each_entry(phy_provider, &phy_provider_list, list) {\n",
- "+\t\tif (phy_provider->dev->of_node == node)\n",
+ "+\t\tif (phy_provider->dev->of_node = node)\n",
"+\t\t\treturn phy_provider;\n",
"+\t}\n",
"+\n",
@@ -579,7 +552,7 @@
"+\tint index = 0;\n",
"+\tstruct phy *phy = NULL;\n",
"+\n",
- "+\tif (string == NULL) {\n",
+ "+\tif (string = NULL) {\n",
"+\t\tdev_WARN(dev, \"missing string\\n\");\n",
"+\t\treturn ERR_PTR(-EINVAL);\n",
"+\t}\n",
@@ -1176,7 +1149,7 @@
"+\t\treturn ret;\n",
"+\n",
"+\tmutex_lock(&phy->mutex);\n",
- "+\tif (phy->init_count++ == 0 && phy->ops->init) {\n",
+ "+\tif (phy->init_count++ = 0 && phy->ops->init) {\n",
"+\t\tret = phy->ops->init(phy);\n",
"+\t\tif (ret < 0) {\n",
"+\t\t\tdev_err(&phy->dev, \"phy init failed --> %d\\n\", ret);\n",
@@ -1199,7 +1172,7 @@
"+\t\treturn ret;\n",
"+\n",
"+\tmutex_lock(&phy->mutex);\n",
- "+\tif (--phy->init_count == 0 && phy->ops->exit) {\n",
+ "+\tif (--phy->init_count = 0 && phy->ops->exit) {\n",
"+\t\tret = phy->ops->exit(phy);\n",
"+\t\tif (ret < 0) {\n",
"+\t\t\tdev_err(&phy->dev, \"phy exit failed --> %d\\n\", ret);\n",
@@ -1222,7 +1195,7 @@
"+\t\treturn ret;\n",
"+\n",
"+\tmutex_lock(&phy->mutex);\n",
- "+\tif (phy->power_count++ == 0 && phy->ops->power_on) {\n",
+ "+\tif (phy->power_count++ = 0 && phy->ops->power_on) {\n",
"+\t\tret = phy->ops->power_on(phy);\n",
"+\t\tif (ret < 0) {\n",
"+\t\t\tdev_err(&phy->dev, \"phy poweron failed --> %d\\n\", ret);\n",
@@ -1241,7 +1214,7 @@
"+\tint ret = -ENOTSUPP;\n",
"+\n",
"+\tmutex_lock(&phy->mutex);\n",
- "+\tif (--phy->power_count == 0 && phy->ops->power_off) {\n",
+ "+\tif (--phy->power_count = 0 && phy->ops->power_off) {\n",
"+\t\tret = phy->ops->power_off(phy);\n",
"+\t\tif (ret < 0) {\n",
"+\t\t\tdev_err(&phy->dev, \"phy poweroff failed --> %d\\n\", ret);\n",
@@ -1261,4 +1234,4 @@
"1.7.10.4"
]
-cdfa399638cfc0c3a472aec25c1da23ee58b8ca527d0aef5274bb51f2623be73
+d2ad9c60c43103898ddd854339c007696e914b17d57fa0f67e8fc1208ac7e137
diff --git a/a/1.txt b/N3/1.txt
index 3be5257..862834b 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -74,7 +74,7 @@ index 0000000..8ae844f
+ *phys* phandle
+
+Example 1:
-+usb1: usb_otg_ss@xxx {
++usb1: usb_otg_ss at xxx {
+ compatible = "xxx";
+ reg = <xxx>;
+ .
@@ -89,7 +89,7 @@ index 0000000..8ae844f
+usb3.
+
+Example 2:
-+usb2: usb_otg_ss@xxx {
++usb2: usb_otg_ss at xxx {
+ compatible = "xxx";
+ reg = <xxx>;
+ .
@@ -248,14 +248,14 @@ index bf61e04..dd03889 100644
+GENERIC PHY FRAMEWORK
+M: Kishon Vijay Abraham I <kishon@ti.com>
-+L: linux-kernel@vger.kernel.org
++L: linux-kernel at vger.kernel.org
+S: Supported
+F: drivers/phy/
+F: include/linux/phy/
+
GENERIC UIO DRIVER FOR PCI DEVICES
M: "Michael S. Tsirkin" <mst@redhat.com>
- L: kvm@vger.kernel.org
+ L: kvm at vger.kernel.org
diff --git a/drivers/Kconfig b/drivers/Kconfig
index aa43b91..8f45144 100644
--- a/drivers/Kconfig
diff --git a/a/content_digest b/N3/content_digest
index 60de62f..5bc205c 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -2,7 +2,7 @@
"ref\0001374129984-765-1-git-send-email-kishon\@ti.com\0"
]
[
- "From\0Kishon Vijay Abraham I <kishon\@ti.com>\0"
+ "From\0kishon\@ti.com (Kishon Vijay Abraham I)\0"
]
[
"Subject\0[PATCH 01/15] drivers: phy: add generic PHY framework\0"
@@ -11,32 +11,7 @@
"Date\0Thu, 18 Jul 2013 12:16:10 +0530\0"
]
[
- "To\0<gregkh\@linuxfoundation.org>",
- " <kyungmin.park\@samsung.com>",
- " <balbi\@ti.com>",
- " <kishon\@ti.com>",
- " <jg1.han\@samsung.com>",
- " <s.nawrocki\@samsung.com>",
- " <kgene.kim\@samsung.com>\0"
-]
-[
- "Cc\0<grant.likely\@linaro.org>",
- " <tony\@atomide.com>",
- " <arnd\@arndb.de>",
- " <swarren\@nvidia.com>",
- " <devicetree-discuss\@lists.ozlabs.org>",
- " <linux-doc\@vger.kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <linux-samsung-soc\@vger.kernel.org>",
- " <linux-omap\@vger.kernel.org>",
- " <linux-usb\@vger.kernel.org>",
- " <linux-media\@vger.kernel.org>",
- " <linux-fbdev\@vger.kernel.org>",
- " <akpm\@linux-foundation.org>",
- " <balajitk\@ti.com>",
- " <george.cherian\@ti.com>",
- " <nsekhar\@ti.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -121,7 +96,7 @@
"+\t *phys* phandle\n",
"+\n",
"+Example 1:\n",
- "+usb1: usb_otg_ss\@xxx {\n",
+ "+usb1: usb_otg_ss at xxx {\n",
"+ compatible = \"xxx\";\n",
"+ reg = <xxx>;\n",
"+ .\n",
@@ -136,7 +111,7 @@
"+usb3.\n",
"+\n",
"+Example 2:\n",
- "+usb2: usb_otg_ss\@xxx {\n",
+ "+usb2: usb_otg_ss at xxx {\n",
"+ compatible = \"xxx\";\n",
"+ reg = <xxx>;\n",
"+ .\n",
@@ -295,14 +270,14 @@
" \n",
"+GENERIC PHY FRAMEWORK\n",
"+M:\tKishon Vijay Abraham I <kishon\@ti.com>\n",
- "+L:\tlinux-kernel\@vger.kernel.org\n",
+ "+L:\tlinux-kernel at vger.kernel.org\n",
"+S:\tSupported\n",
"+F:\tdrivers/phy/\n",
"+F:\tinclude/linux/phy/\n",
"+\n",
" GENERIC UIO DRIVER FOR PCI DEVICES\n",
" M:\t\"Michael S. Tsirkin\" <mst\@redhat.com>\n",
- " L:\tkvm\@vger.kernel.org\n",
+ " L:\tkvm at vger.kernel.org\n",
"diff --git a/drivers/Kconfig b/drivers/Kconfig\n",
"index aa43b91..8f45144 100644\n",
"--- a/drivers/Kconfig\n",
@@ -1261,4 +1236,4 @@
"1.7.10.4"
]
-cdfa399638cfc0c3a472aec25c1da23ee58b8ca527d0aef5274bb51f2623be73
+a52dc6133389feeb926f6188f734dfad42a0239b544a7552384fbb32110f9348
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.