diff for duplicates of <157909516006.20155.16914270465856385214.stgit@warthog.procyon.org.uk>

diff --git a/a/1.txt b/N1/1.txt
index 8cfdba9..329817b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -33,7 +33,7 @@ index ecea41ce919b..71b6f37d49c1 100644
 --- a/security/smack/smack_lsm.c
 +++ b/security/smack/smack_lsm.c
 @@ -4273,7 +4273,7 @@ static int smack_key_permission(key_ref_t key_ref,
- 	if (tkp == NULL)
+ 	if (tkp = NULL)
  		return -EACCES;
  
 -	if (smack_privileged_cred(CAP_MAC_OVERRIDE, cred))
@@ -60,18 +60,18 @@ index ecea41ce919b..71b6f37d49c1 100644
 +	struct smack_known *tkp = smk_of_current();
 +	int rc;
 +
-+	if (key == NULL)
++	if (key = NULL)
 +		return -EINVAL;
 +	/*
 +	 * If the key hasn't been initialized give it access so that
 +	 * it may do so.
 +	 */
-+	if (key->security == NULL)
++	if (key->security = NULL)
 +		return 0;
 +	/*
 +	 * This should not occur
 +	 */
-+	if (tkp == NULL)
++	if (tkp = NULL)
 +		return -EACCES;
 +
 +	if (smack_privileged_cred(CAP_MAC_OVERRIDE, current_cred()))
@@ -105,7 +105,7 @@ index ecea41ce919b..71b6f37d49c1 100644
 +	int rc;
 +
 +	/* Always let maintenance notifications through. */
-+	if (n->type == WATCH_TYPE_META)
++	if (n->type = WATCH_TYPE_META)
 +		return 0;
 +
 +	if (!cred)
diff --git a/a/content_digest b/N1/content_digest
index 390a951..ef7f19e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -20,15 +20,12 @@
   " Stephen Smalley <sds\@tycho.nsa.gov>",
   " nicolas.dichtel\@6wind.com",
   " raven\@themaw.net",
-  " Christian Brauner <christian\@brauner.io>",
-  " dhowells\@redhat.com",
+  " Christian Brauner <christian\@brauner.io>dhowells\@redhat.com",
   " keyrings\@vger.kernel.org",
   " linux-usb\@vger.kernel.org",
   " linux-block\@vger.kernel.org",
   " linux-security-module\@vger.kernel.org",
-  " linux-fsdevel\@vger.kernel.org",
-  " linux-api\@vger.kernel.org",
-  " linux-security-module\@vger.kernel.org",
+  " linux-fsdevel\@vger.kernel.org\@vger.kernel.org",
   " linux-kernel\@vger.kernel.org\0"
 ]
 [
@@ -73,7 +70,7 @@
   "--- a/security/smack/smack_lsm.c\n",
   "+++ b/security/smack/smack_lsm.c\n",
   "\@\@ -4273,7 +4273,7 \@\@ static int smack_key_permission(key_ref_t key_ref,\n",
-  " \tif (tkp == NULL)\n",
+  " \tif (tkp = NULL)\n",
   " \t\treturn -EACCES;\n",
   " \n",
   "-\tif (smack_privileged_cred(CAP_MAC_OVERRIDE, cred))\n",
@@ -100,18 +97,18 @@
   "+\tstruct smack_known *tkp = smk_of_current();\n",
   "+\tint rc;\n",
   "+\n",
-  "+\tif (key == NULL)\n",
+  "+\tif (key = NULL)\n",
   "+\t\treturn -EINVAL;\n",
   "+\t/*\n",
   "+\t * If the key hasn't been initialized give it access so that\n",
   "+\t * it may do so.\n",
   "+\t */\n",
-  "+\tif (key->security == NULL)\n",
+  "+\tif (key->security = NULL)\n",
   "+\t\treturn 0;\n",
   "+\t/*\n",
   "+\t * This should not occur\n",
   "+\t */\n",
-  "+\tif (tkp == NULL)\n",
+  "+\tif (tkp = NULL)\n",
   "+\t\treturn -EACCES;\n",
   "+\n",
   "+\tif (smack_privileged_cred(CAP_MAC_OVERRIDE, current_cred()))\n",
@@ -145,7 +142,7 @@
   "+\tint rc;\n",
   "+\n",
   "+\t/* Always let maintenance notifications through. */\n",
-  "+\tif (n->type == WATCH_TYPE_META)\n",
+  "+\tif (n->type = WATCH_TYPE_META)\n",
   "+\t\treturn 0;\n",
   "+\n",
   "+\tif (!cred)\n",
@@ -181,4 +178,4 @@
   " \tLSM_HOOK_INIT(audit_rule_init, smack_audit_rule_init),"
 ]
 
-0a9ef66daf6709a8c8b6ff6203af0240590ca38193b6d4c690331fc39aeb253d
+440c62d3b1308615e66488b3f9f3b312c7fe3d3c744ea1a0d57bc3b4398cf5ed
