All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <9bf4d6dbe3514a8eafaa66d87dd7355e@BY2FFO11FD041.protection.gbl>

diff --git a/a/1.txt b/N1/1.txt
index 2c08508..8c65879 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -36,7 +36,7 @@ changes since RFC:
  - support pinconf
    - supported attributes
      - pin-bias: pull up, tristate, disable
-     - slew-rate: 0 = slow, 1 = fast; generic pinconf does not display
+     - slew-rate: 0 == slow, 1 == fast; generic pinconf does not display
        argument
 ---
  drivers/pinctrl/Kconfig        |    8 +
@@ -933,9 +933,9 @@ index 000000000000..c2fc9035dde9
 +	 * SD WP & CD are special. They have dedicated registers
 +	 * to mux them in
 +	 */
-+	if (function = ZYNQ_PMUX_sdio0_cd || function = ZYNQ_PMUX_sdio0_wp ||
-+			function = ZYNQ_PMUX_sdio1_cd ||
-+			function = ZYNQ_PMUX_sdio1_wp) {
++	if (function == ZYNQ_PMUX_sdio0_cd || function == ZYNQ_PMUX_sdio0_wp ||
++			function == ZYNQ_PMUX_sdio1_cd ||
++			function == ZYNQ_PMUX_sdio1_wp) {
 +		u32 reg;
 +
 +		ret = regmap_read(pctrl->syscon,
diff --git a/a/content_digest b/N1/content_digest
index 8fba076..c9a6a82 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,31 @@
   "Subject\0[PATCH v3 4/7] pinctrl: Add driver for Zynq\0"
 ]
 [
-  "Date\0Fri, 12 Dec 2014 16:34:55 +0000\0"
+  "Date\0Fri, 12 Dec 2014 08:34:55 -0800\0"
 ]
 [
-  "To\0linux-arm-kernel\@lists.infradead.org\0"
+  "To\0Linus Walleij <linus.walleij\@linaro.org>",
+  " Rob Herring <robh+dt\@kernel.org>",
+  " Pawel Moll <pawel.moll\@arm.com>",
+  " Mark Rutland <mark.rutland\@arm.com>\0"
+]
+[
+  "Cc\0S\303\266ren Brinkmann <soren.brinkmann\@xilinx.com>",
+  " Michal Simek <michal.simek\@xilinx.com>",
+  " linux-kernel\@vger.kernel.org",
+  " linux-arm-kernel\@lists.infradead.org",
+  " Alessandro Rubini <rubini\@unipv.it>",
+  " Heiko Stuebner <heiko\@sntech.de>",
+  " Laurent Pinchart <laurent.pinchart\@ideasonboard.com>",
+  " linux-rockchip\@lists.infradead.org",
+  " linux-sh\@vger.kernel.org",
+  " Ivan T. Ivanov <iivanov\@mm-sol.com>",
+  " Bjorn Andersson <bjorn.andersson\@sonymobile.com>",
+  " Beniamino Galvani <b.galvani\@gmail.com>",
+  " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
+  " Kumar Gala <galak\@codeaurora.org>",
+  " Grant Likely <grant.likely\@linaro.org>",
+  " devicetree\@vger.kernel.org\0"
 ]
 [
   "\0000:1\0"
@@ -58,7 +79,7 @@
   " - support pinconf\n",
   "   - supported attributes\n",
   "     - pin-bias: pull up, tristate, disable\n",
-  "     - slew-rate: 0 = slow, 1 = fast; generic pinconf does not display\n",
+  "     - slew-rate: 0 == slow, 1 == fast; generic pinconf does not display\n",
   "       argument\n",
   "---\n",
   " drivers/pinctrl/Kconfig        |    8 +\n",
@@ -955,9 +976,9 @@
   "+\t * SD WP & CD are special. They have dedicated registers\n",
   "+\t * to mux them in\n",
   "+\t */\n",
-  "+\tif (function = ZYNQ_PMUX_sdio0_cd || function = ZYNQ_PMUX_sdio0_wp ||\n",
-  "+\t\t\tfunction = ZYNQ_PMUX_sdio1_cd ||\n",
-  "+\t\t\tfunction = ZYNQ_PMUX_sdio1_wp) {\n",
+  "+\tif (function == ZYNQ_PMUX_sdio0_cd || function == ZYNQ_PMUX_sdio0_wp ||\n",
+  "+\t\t\tfunction == ZYNQ_PMUX_sdio1_cd ||\n",
+  "+\t\t\tfunction == ZYNQ_PMUX_sdio1_wp) {\n",
   "+\t\tu32 reg;\n",
   "+\n",
   "+\t\tret = regmap_read(pctrl->syscon,\n",
@@ -1284,4 +1305,4 @@
   "2.2.0.1.g9ee0458"
 ]
 
-3c8e2246ac372f8c94202b7e9effdbbcfb09bb578b5a4d8b47422aa7229af6c4
+00af409db025acb0a1255db90e3451bb2fd741859ff96020b22ea91a54ad4fb7

diff --git a/a/1.txt b/N2/1.txt
index 2c08508..852969a 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,7 +1,7 @@
 This adds a pin-control driver for Zynq.
 
 Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
-Tested-by: Andreas Färber <afaerber@suse.de>
+Tested-by: Andreas F?rber <afaerber@suse.de>
 ---
 Changes since v2:
 - driver-specific DT properties are passed to the core in two arrays,
@@ -36,7 +36,7 @@ changes since RFC:
  - support pinconf
    - supported attributes
      - pin-bias: pull up, tristate, disable
-     - slew-rate: 0 = slow, 1 = fast; generic pinconf does not display
+     - slew-rate: 0 == slow, 1 == fast; generic pinconf does not display
        argument
 ---
  drivers/pinctrl/Kconfig        |    8 +
@@ -87,7 +87,7 @@ index 000000000000..c2fc9035dde9
 + *
 + *  Copyright (C) 2014 Xilinx
 + *
-+ *  Sören Brinkmann <soren.brinkmann@xilinx.com>
++ *  S?ren Brinkmann <soren.brinkmann@xilinx.com>
 + *
 + * This program is free software: you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -933,9 +933,9 @@ index 000000000000..c2fc9035dde9
 +	 * SD WP & CD are special. They have dedicated registers
 +	 * to mux them in
 +	 */
-+	if (function = ZYNQ_PMUX_sdio0_cd || function = ZYNQ_PMUX_sdio0_wp ||
-+			function = ZYNQ_PMUX_sdio1_cd ||
-+			function = ZYNQ_PMUX_sdio1_wp) {
++	if (function == ZYNQ_PMUX_sdio0_cd || function == ZYNQ_PMUX_sdio0_wp ||
++			function == ZYNQ_PMUX_sdio1_cd ||
++			function == ZYNQ_PMUX_sdio1_wp) {
 +		u32 reg;
 +
 +		ret = regmap_read(pctrl->syscon,
@@ -1255,7 +1255,7 @@ index 000000000000..c2fc9035dde9
 +
 +module_platform_driver(zynq_pinctrl_driver);
 +
-+MODULE_AUTHOR("Sören Brinkmann <soren.brinkmann@xilinx.com>");
++MODULE_AUTHOR("S?ren Brinkmann <soren.brinkmann@xilinx.com>");
 +MODULE_DESCRIPTION("Xilinx Zynq pinctrl driver");
 +MODULE_LICENSE("GPL");
 -- 
diff --git a/a/content_digest b/N2/content_digest
index 8fba076..965d346 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,13 +2,13 @@
   "ref\0001418402098-3811-1-git-send-email-soren.brinkmann\@xilinx.com\0"
 ]
 [
-  "From\0Soren Brinkmann <soren.brinkmann\@xilinx.com>\0"
+  "From\0soren.brinkmann\@xilinx.com (Soren Brinkmann)\0"
 ]
 [
   "Subject\0[PATCH v3 4/7] pinctrl: Add driver for Zynq\0"
 ]
 [
-  "Date\0Fri, 12 Dec 2014 16:34:55 +0000\0"
+  "Date\0Fri, 12 Dec 2014 08:34:55 -0800\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -23,7 +23,7 @@
   "This adds a pin-control driver for Zynq.\n",
   "\n",
   "Signed-off-by: Soren Brinkmann <soren.brinkmann\@xilinx.com>\n",
-  "Tested-by: Andreas F\303\244rber <afaerber\@suse.de>\n",
+  "Tested-by: Andreas F?rber <afaerber\@suse.de>\n",
   "---\n",
   "Changes since v2:\n",
   "- driver-specific DT properties are passed to the core in two arrays,\n",
@@ -58,7 +58,7 @@
   " - support pinconf\n",
   "   - supported attributes\n",
   "     - pin-bias: pull up, tristate, disable\n",
-  "     - slew-rate: 0 = slow, 1 = fast; generic pinconf does not display\n",
+  "     - slew-rate: 0 == slow, 1 == fast; generic pinconf does not display\n",
   "       argument\n",
   "---\n",
   " drivers/pinctrl/Kconfig        |    8 +\n",
@@ -109,7 +109,7 @@
   "+ *\n",
   "+ *  Copyright (C) 2014 Xilinx\n",
   "+ *\n",
-  "+ *  S\303\266ren Brinkmann <soren.brinkmann\@xilinx.com>\n",
+  "+ *  S?ren Brinkmann <soren.brinkmann\@xilinx.com>\n",
   "+ *\n",
   "+ * This program is free software: you can redistribute it and/or modify\n",
   "+ * it under the terms of the GNU General Public License as published by\n",
@@ -955,9 +955,9 @@
   "+\t * SD WP & CD are special. They have dedicated registers\n",
   "+\t * to mux them in\n",
   "+\t */\n",
-  "+\tif (function = ZYNQ_PMUX_sdio0_cd || function = ZYNQ_PMUX_sdio0_wp ||\n",
-  "+\t\t\tfunction = ZYNQ_PMUX_sdio1_cd ||\n",
-  "+\t\t\tfunction = ZYNQ_PMUX_sdio1_wp) {\n",
+  "+\tif (function == ZYNQ_PMUX_sdio0_cd || function == ZYNQ_PMUX_sdio0_wp ||\n",
+  "+\t\t\tfunction == ZYNQ_PMUX_sdio1_cd ||\n",
+  "+\t\t\tfunction == ZYNQ_PMUX_sdio1_wp) {\n",
   "+\t\tu32 reg;\n",
   "+\n",
   "+\t\tret = regmap_read(pctrl->syscon,\n",
@@ -1277,11 +1277,11 @@
   "+\n",
   "+module_platform_driver(zynq_pinctrl_driver);\n",
   "+\n",
-  "+MODULE_AUTHOR(\"S\303\266ren Brinkmann <soren.brinkmann\@xilinx.com>\");\n",
+  "+MODULE_AUTHOR(\"S?ren Brinkmann <soren.brinkmann\@xilinx.com>\");\n",
   "+MODULE_DESCRIPTION(\"Xilinx Zynq pinctrl driver\");\n",
   "+MODULE_LICENSE(\"GPL\");\n",
   "-- \n",
   "2.2.0.1.g9ee0458"
 ]
 
-3c8e2246ac372f8c94202b7e9effdbbcfb09bb578b5a4d8b47422aa7229af6c4
+9c551e7a73359b8b59714f118c20df9d9a25f7866e047c9f0a5d73d70d3984e4

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.