diff for duplicates of <20190613070903.17214-5-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index e8a9f3a..8ad7a70 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -132,8 +132,8 @@ index c0e4535dc1ec..3e7f4a6cffa2 100644
* fix up the flags for the older format, there were all kinds
* of endian hacks, this only works for the simple cases
*/
-- if (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))
-+ if (rev = OLD_FLAT_VERSION &&
+- if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))
++ if (rev == OLD_FLAT_VERSION &&
+ (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))
flags = FLAT_FLAG_RAM;
diff --git a/a/content_digest b/N1/content_digest
index 7d5e449..669c844 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,21 +8,21 @@
"Subject\0[PATCH 04/17] binfmt_flat: remove flat_old_ram_flag\0"
]
[
- "Date\0Thu, 13 Jun 2019 07:08:50 +0000\0"
+ "Date\0Thu, 13 Jun 2019 09:08:50 +0200\0"
]
[
"To\0Greg Ungerer <gerg\@linux-m68k.org>\0"
]
[
- "Cc\0uclinux-h8-devel\@lists.sourceforge.jp",
- " linux-xtensa\@linux-xtensa.org",
- " Michal Simek <monstr\@monstr.eu>",
+ "Cc\0Michal Simek <monstr\@monstr.eu>",
+ " linux-arm-kernel\@lists.infradead.org",
" linux-c6x-dev\@linux-c6x.org",
- " linux-sh\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
+ " uclinux-h8-devel\@lists.sourceforge.jp",
" linux-m68k\@lists.linux-m68k.org",
" linux-riscv\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ " linux-sh\@vger.kernel.org",
+ " linux-xtensa\@linux-xtensa.org",
+ " linux-kernel\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -165,8 +165,8 @@
" \t * fix up the flags for the older format, there were all kinds\n",
" \t * of endian hacks, this only works for the simple cases\n",
" \t */\n",
- "-\tif (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n",
- "+\tif (rev = OLD_FLAT_VERSION &&\n",
+ "-\tif (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n",
+ "+\tif (rev == OLD_FLAT_VERSION &&\n",
"+\t (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))\n",
" \t\tflags = FLAT_FLAG_RAM;\n",
" \n",
@@ -175,4 +175,4 @@
"2.20.1"
]
-c4d3c02ee9060cea558812c63955b3dee48423f8b6327788810e120f7a37da4f
+0f72a4070a797e81a846061463229f5e3c93aa66c5ef5247fca38f2da42ae728
diff --git a/a/1.txt b/N2/1.txt
index e8a9f3a..1aa43f4 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -132,11 +132,17 @@ index c0e4535dc1ec..3e7f4a6cffa2 100644
* fix up the flags for the older format, there were all kinds
* of endian hacks, this only works for the simple cases
*/
-- if (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))
-+ if (rev = OLD_FLAT_VERSION &&
+- if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))
++ if (rev == OLD_FLAT_VERSION &&
+ (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))
flags = FLAT_FLAG_RAM;
#ifndef CONFIG_BINFMT_ZFLAT
--
-2.20.1
\ No newline at end of file
+2.20.1
+
+
+_______________________________________________
+linux-riscv mailing list
+linux-riscv@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-riscv
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 7d5e449..de72aaf 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 04/17] binfmt_flat: remove flat_old_ram_flag\0"
]
[
- "Date\0Thu, 13 Jun 2019 07:08:50 +0000\0"
+ "Date\0Thu, 13 Jun 2019 09:08:50 +0200\0"
]
[
"To\0Greg Ungerer <gerg\@linux-m68k.org>\0"
@@ -165,14 +165,20 @@
" \t * fix up the flags for the older format, there were all kinds\n",
" \t * of endian hacks, this only works for the simple cases\n",
" \t */\n",
- "-\tif (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n",
- "+\tif (rev = OLD_FLAT_VERSION &&\n",
+ "-\tif (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n",
+ "+\tif (rev == OLD_FLAT_VERSION &&\n",
"+\t (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))\n",
" \t\tflags = FLAT_FLAG_RAM;\n",
" \n",
" #ifndef CONFIG_BINFMT_ZFLAT\n",
"-- \n",
- "2.20.1"
+ "2.20.1\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-riscv mailing list\n",
+ "linux-riscv\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-riscv"
]
-c4d3c02ee9060cea558812c63955b3dee48423f8b6327788810e120f7a37da4f
+2941c67597f5cb289ded71b5a161732a6a345aafd0eac8669ff0a3fbfc3300d9
diff --git a/a/1.txt b/N3/1.txt
index e8a9f3a..6ad3089 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -132,11 +132,17 @@ index c0e4535dc1ec..3e7f4a6cffa2 100644
* fix up the flags for the older format, there were all kinds
* of endian hacks, this only works for the simple cases
*/
-- if (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))
-+ if (rev = OLD_FLAT_VERSION &&
+- if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))
++ if (rev == OLD_FLAT_VERSION &&
+ (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))
flags = FLAT_FLAG_RAM;
#ifndef CONFIG_BINFMT_ZFLAT
--
-2.20.1
\ No newline at end of file
+2.20.1
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
diff --git a/a/content_digest b/N3/content_digest
index 7d5e449..4eebf64 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 04/17] binfmt_flat: remove flat_old_ram_flag\0"
]
[
- "Date\0Thu, 13 Jun 2019 07:08:50 +0000\0"
+ "Date\0Thu, 13 Jun 2019 09:08:50 +0200\0"
]
[
"To\0Greg Ungerer <gerg\@linux-m68k.org>\0"
@@ -165,14 +165,20 @@
" \t * fix up the flags for the older format, there were all kinds\n",
" \t * of endian hacks, this only works for the simple cases\n",
" \t */\n",
- "-\tif (rev = OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n",
- "+\tif (rev = OLD_FLAT_VERSION &&\n",
+ "-\tif (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))\n",
+ "+\tif (rev == OLD_FLAT_VERSION &&\n",
"+\t (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))\n",
" \t\tflags = FLAT_FLAG_RAM;\n",
" \n",
" #ifndef CONFIG_BINFMT_ZFLAT\n",
"-- \n",
- "2.20.1"
+ "2.20.1\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-arm-kernel mailing list\n",
+ "linux-arm-kernel\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
]
-c4d3c02ee9060cea558812c63955b3dee48423f8b6327788810e120f7a37da4f
+7ca6fc38d9ac44d851a1eb892bb7e47ec396b948a6fe2984b10e50fd07f2b763
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.