diff for duplicates of <20190808162702.GJ10425@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index bf59a4b..b508704 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,62 +15,3 @@ A file, as distinct from device nodes, sockets, symlinks etc.
 
 I think this is fairly standard UNIX terminology, even though it sounds
 vague:
-
-From glibc's <bits/stat.h>:
-
-#define	__S_IFREG	0100000	/* Regular file.  */
-
-
-Or for POSIX test (a.k.a. "[")
-
-       -f file
-              True if file exists and is a regular file.
-
-Using memfd_create() or opening /dev/zero doesn't yield a regular file
-though, so perhaps those should be a separate bullet.
-
-[...]
-
-> > +The AArch64 Tagged Address ABI is an opt-in feature and an application can
-> > +control it via **prctl()** as follows:
-> > +
-> > +- **PR_SET_TAGGED_ADDR_CTRL**: enable or disable the AArch64 Tagged Address
-> > +  ABI for the calling process.
-> > +
-> > +  The (unsigned int) arg2 argument is a bit mask describing the control mode
-> > +  used:
-> > +
-> > +  - **PR_TAGGED_ADDR_ENABLE**: enable AArch64 Tagged Address ABI. Default
-> > +    status is disabled.
-> > +
-> > +  The arguments arg3, arg4, and arg5 are ignored.
-> 
-> For previous prctl()'s, we've found that it's best to require that the
-> unused arguments be 0.  Without that, apps are free to put garbage
-> there, which makes extending the prctl to use other arguments impossible
-> in the future.
-
-Because arg2 is already a mask of flags with some flags unallocated,
-we can add a new flag for ABI extensions.
-
-If arg3 is used someday, it may or may not be natural for 0 to mean
-"default".  Enabling this argument with an explicit flag in arg2 may
-be cleaner than mangling the semantics of arg3 so that 0 can have
-the right meaning.
-
-Avoiding redundant 0 arguments also allows userspace to take advantage
-of the glibc's variadic prototype for prctl() for example.
-
-Not a huge deal, but that was my rationale anyway.
-
-> Also, shouldn't this be converted over to an arch_prctl()?
-
-Most arch-specific prctls seem to use prctl(), and arm64 already has a
-few there.
-
-arch_prctl() is x86-specific.  I don't know the history.
-
-[...]
-
-Cheers
----Dave
diff --git a/a/content_digest b/N1/content_digest
index 94f0e91..95a00fc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,15 +5,15 @@
  "Subject\0Re: [PATCH v7 1/2] arm64: Define Documentation/arm64/tagged-address-abi.rst\0"
  "Date\0Thu, 8 Aug 2019 17:27:02 +0100\0"
  "To\0Dave Hansen <dave.hansen@intel.com>\0"
- "Cc\0linux-arch@vger.kernel.org"
+ "Cc\0Catalin Marinas <catalin.marinas@arm.com>"
+  linux-arm-kernel@lists.infradead.org
+  linux-arch@vger.kernel.org
   linux-doc@vger.kernel.org
   Szabolcs Nagy <szabolcs.nagy@arm.com>
-  Catalin Marinas <catalin.marinas@arm.com>
+  Andrey Konovalov <andreyknvl@google.com>
   Kevin Brodsky <kevin.brodsky@arm.com>
   Will Deacon <will.deacon@arm.com>
-  Andrey Konovalov <andreyknvl@google.com>
-  Vincenzo Frascino <vincenzo.frascino@arm.com>
- " linux-arm-kernel@lists.infradead.org\0"
+ " Vincenzo Frascino <vincenzo.frascino@arm.com>\0"
  "\00:1\0"
  "b\0"
  "On Wed, Aug 07, 2019 at 01:38:16PM -0700, Dave Hansen wrote:\n"
@@ -32,65 +32,6 @@
  "A file, as distinct from device nodes, sockets, symlinks etc.\n"
  "\n"
  "I think this is fairly standard UNIX terminology, even though it sounds\n"
- "vague:\n"
- "\n"
- "From glibc's <bits/stat.h>:\n"
- "\n"
- "#define\t__S_IFREG\t0100000\t/* Regular file.  */\n"
- "\n"
- "\n"
- "Or for POSIX test (a.k.a. \"[\")\n"
- "\n"
- "       -f file\n"
- "              True if file exists and is a regular file.\n"
- "\n"
- "Using memfd_create() or opening /dev/zero doesn't yield a regular file\n"
- "though, so perhaps those should be a separate bullet.\n"
- "\n"
- "[...]\n"
- "\n"
- "> > +The AArch64 Tagged Address ABI is an opt-in feature and an application can\n"
- "> > +control it via **prctl()** as follows:\n"
- "> > +\n"
- "> > +- **PR_SET_TAGGED_ADDR_CTRL**: enable or disable the AArch64 Tagged Address\n"
- "> > +  ABI for the calling process.\n"
- "> > +\n"
- "> > +  The (unsigned int) arg2 argument is a bit mask describing the control mode\n"
- "> > +  used:\n"
- "> > +\n"
- "> > +  - **PR_TAGGED_ADDR_ENABLE**: enable AArch64 Tagged Address ABI. Default\n"
- "> > +    status is disabled.\n"
- "> > +\n"
- "> > +  The arguments arg3, arg4, and arg5 are ignored.\n"
- "> \n"
- "> For previous prctl()'s, we've found that it's best to require that the\n"
- "> unused arguments be 0.  Without that, apps are free to put garbage\n"
- "> there, which makes extending the prctl to use other arguments impossible\n"
- "> in the future.\n"
- "\n"
- "Because arg2 is already a mask of flags with some flags unallocated,\n"
- "we can add a new flag for ABI extensions.\n"
- "\n"
- "If arg3 is used someday, it may or may not be natural for 0 to mean\n"
- "\"default\".  Enabling this argument with an explicit flag in arg2 may\n"
- "be cleaner than mangling the semantics of arg3 so that 0 can have\n"
- "the right meaning.\n"
- "\n"
- "Avoiding redundant 0 arguments also allows userspace to take advantage\n"
- "of the glibc's variadic prototype for prctl() for example.\n"
- "\n"
- "Not a huge deal, but that was my rationale anyway.\n"
- "\n"
- "> Also, shouldn't this be converted over to an arch_prctl()?\n"
- "\n"
- "Most arch-specific prctls seem to use prctl(), and arm64 already has a\n"
- "few there.\n"
- "\n"
- "arch_prctl() is x86-specific.  I don't know the history.\n"
- "\n"
- "[...]\n"
- "\n"
- "Cheers\n"
- ---Dave
+ vague:
 
-57bd1fc2bed170fc424ff14dbce7f03178960198aebe84251733797a1f6f956f
+f72a82ff677417d2fdb6c3730b346a8890501524ba9041214702321677ec770e
