diff for duplicates of <20180328125254.31380-83-marc.zyngier@arm.com>
diff --git a/a/1.txt b/N1/1.txt
index a101e6b..edd3c9f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -56,7 +56,7 @@ index 8327ea932aea..45aa433f018f 100644
+ val |= irq->hwintid << GICH_LR_PHYSID_CPUID_SHIFT;
+ /*
+ * Never set pending+active on a HW interrupt, as the
-+ * pending state is kept at the physical distributor
++ * pending state is kept@the physical distributor
+ * level.
+ */
+ if (irq->active)
@@ -91,7 +91,7 @@ index 8327ea932aea..45aa433f018f 100644
- val |= irq->hwintid << GICH_LR_PHYSID_CPUID_SHIFT;
- /*
- * Never set pending+active on a HW interrupt, as the
-- * pending state is kept at the physical distributor
+- * pending state is kept@the physical distributor
- * level.
- */
- if (irq->active && irq_is_pending(irq))
@@ -137,7 +137,7 @@ index e17f61a434fa..8195f52ae6f0 100644
+ val |= ((u64)irq->hwintid) << ICH_LR_PHYS_ID_SHIFT;
+ /*
+ * Never set pending+active on a HW interrupt, as the
-+ * pending state is kept at the physical distributor
++ * pending state is kept@the physical distributor
+ * level.
+ */
+ if (irq->active)
@@ -172,7 +172,7 @@ index e17f61a434fa..8195f52ae6f0 100644
- val |= ((u64)irq->hwintid) << ICH_LR_PHYS_ID_SHIFT;
- /*
- * Never set pending+active on a HW interrupt, as the
-- * pending state is kept at the physical distributor
+- * pending state is kept@the physical distributor
- * level.
- */
- if (irq->active && irq_is_pending(irq))
diff --git a/a/content_digest b/N1/content_digest
index 460e5c2..c35bb06 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020180328125254.31380-1-marc.zyngier\@arm.com\0"
]
[
- "From\0Marc Zyngier <marc.zyngier\@arm.com>\0"
+ "From\0marc.zyngier\@arm.com (Marc Zyngier)\0"
]
[
"Subject\0[PATCH 82/85] KVM: arm/arm64: vgic: Disallow Active+Pending for level interrupts\0"
@@ -11,21 +11,7 @@
"Date\0Wed, 28 Mar 2018 13:52:51 +0100\0"
]
[
- "To\0Paolo Bonzini <pbonzini\@redhat.com>",
- " Radim Kr\304\215m\303\241\305\231 <rkrcmar\@redhat.com>",
- " kvmarm\@lists.cs.columbia.edu",
- " linux-arm-kernel\@lists.infradead.org",
- " kvm\@vger.kernel.org\0"
-]
-[
- "Cc\0Christoffer Dall <cdall\@cs.columbia.edu>",
- " Shunyong Yang <shunyong.yang\@hxt-semitech.com>",
- " Julien Thierry <julien.thierry\@arm.com>",
- " Andre Przywara <andre.przywara\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " Shih-Wei Li <shihwei\@cs.columbia.edu>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Dave Martin <Dave.Martin\@arm.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -92,7 +78,7 @@
"+\t\tval |= irq->hwintid << GICH_LR_PHYSID_CPUID_SHIFT;\n",
"+\t\t/*\n",
"+\t\t * Never set pending+active on a HW interrupt, as the\n",
- "+\t\t * pending state is kept at the physical distributor\n",
+ "+\t\t * pending state is kept\@the physical distributor\n",
"+\t\t * level.\n",
"+\t\t */\n",
"+\t\tif (irq->active)\n",
@@ -127,7 +113,7 @@
"-\t\tval |= irq->hwintid << GICH_LR_PHYSID_CPUID_SHIFT;\n",
"-\t\t/*\n",
"-\t\t * Never set pending+active on a HW interrupt, as the\n",
- "-\t\t * pending state is kept at the physical distributor\n",
+ "-\t\t * pending state is kept\@the physical distributor\n",
"-\t\t * level.\n",
"-\t\t */\n",
"-\t\tif (irq->active && irq_is_pending(irq))\n",
@@ -173,7 +159,7 @@
"+\t\tval |= ((u64)irq->hwintid) << ICH_LR_PHYS_ID_SHIFT;\n",
"+\t\t/*\n",
"+\t\t * Never set pending+active on a HW interrupt, as the\n",
- "+\t\t * pending state is kept at the physical distributor\n",
+ "+\t\t * pending state is kept\@the physical distributor\n",
"+\t\t * level.\n",
"+\t\t */\n",
"+\t\tif (irq->active)\n",
@@ -208,7 +194,7 @@
"-\t\tval |= ((u64)irq->hwintid) << ICH_LR_PHYS_ID_SHIFT;\n",
"-\t\t/*\n",
"-\t\t * Never set pending+active on a HW interrupt, as the\n",
- "-\t\t * pending state is kept at the physical distributor\n",
+ "-\t\t * pending state is kept\@the physical distributor\n",
"-\t\t * level.\n",
"-\t\t */\n",
"-\t\tif (irq->active && irq_is_pending(irq))\n",
@@ -225,4 +211,4 @@
"2.14.2"
]
-71175d5af93fdf3c2413bfa847a205904ed6c7594827d561ae356747bcc327a9
+7dd1ec428b03eedbeea042461fde98e99c84200fbec8fa1285b7ab76036e0ea6
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.