diff for duplicates of <20160420010343.GI17863@localhost> diff --git a/a/content_digest b/N1/content_digest index c4332d7..f8ca8c0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01460386231-8377-1-git-send-email-m-karicheri2@ti.com\0" - "From\0Bjorn Helgaas <helgaas@kernel.org>\0" - "Subject\0Re: [PATCH next v2 1/2] PCI: keystone: add pci error irq handler\0" + "From\0helgaas@kernel.org (Bjorn Helgaas)\0" + "Subject\0[PATCH next v2 1/2] PCI: keystone: add pci error irq handler\0" "Date\0Tue, 19 Apr 2016 20:03:43 -0500\0" - "To\0Murali Karicheri <m-karicheri2@ti.com>\0" - "Cc\0bhelgaas@google.com" - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-pci@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Murali,\n" @@ -253,4 +248,4 @@ " \t\t\tstruct device_node *msi_intc_np);\n" int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, -7d0389ee724128cd13c3c155be0afadcf137c893cb6f4780f8fe1255557f6167 +b656cd2090fc08db53d2c76b81648272729a9687229db1217d06195b185adfba
diff --git a/a/1.txt b/N2/1.txt index ed2f352..8b8249c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,14 +5,14 @@ On Mon, Apr 11, 2016 at 10:50:30AM -0400, Murali Karicheri wrote: > irq instead of standard msi/legacy irq. Add a simple error handler that > logs the fatal interrupt status to the console. > -> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> -> Acked-by: Rob Herring <robh@kernel.org> -> Cc: Rob Herring <robh+dt@kernel.org> -> Cc: Pawel Moll <pawel.moll@arm.com> -> Cc: Mark Rutland <mark.rutland@arm.com> -> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> -> Cc: Kumar Gala <galak@codeaurora.org> -> Cc: Bjorn Helgaas <bhelgaas@google.com> +> Signed-off-by: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org> +> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +> Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +> Cc: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> +> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> +> Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> +> Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> +> Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> I applied this with minor changes to pci/host-keystone for v4.7. See below: @@ -55,7 +55,7 @@ This is applied to pci/host-keystone for v4.7. commit 7be92716c1aa40f5690e6a5f01fc0d385dd72303 -Author: Murali Karicheri <m-karicheri2@ti.com> +Author: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org> Date: Mon Apr 11 10:50:30 2016 -0400 PCI: keystone: Add error IRQ handler @@ -65,13 +65,13 @@ Date: Mon Apr 11 10:50:30 2016 -0400 logs the fatal interrupt status to the console. [bhelgaas: tidy comments, return irqreturn_t directly] - Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> - Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> - Acked-by: Rob Herring <robh@kernel.org> - CC: Pawel Moll <pawel.moll@arm.com> - CC: Mark Rutland <mark.rutland@arm.com> - CC: Ian Campbell <ijc+devicetree@hellion.org.uk> - CC: Kumar Gala <galak@codeaurora.org> + Signed-off-by: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org> + Signed-off-by: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> + Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + CC: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + CC: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + CC: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + CC: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> diff --git a/Documentation/devicetree/bindings/pci/pci-keystone.txt b/Documentation/devicetree/bindings/pci/pci-keystone.txt index 54eae29..d08a4d5 100644 @@ -240,3 +240,7 @@ index f0944e8..a5b0cb2 100644 int ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie, struct device_node *msi_intc_np); int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index c4332d7..9110244 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,14 @@ "ref\01460386231-8377-1-git-send-email-m-karicheri2@ti.com\0" - "From\0Bjorn Helgaas <helgaas@kernel.org>\0" + "ref\01460386231-8377-1-git-send-email-m-karicheri2-l0cyMroinI0@public.gmane.org\0" + "From\0Bjorn Helgaas <helgaas-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH next v2 1/2] PCI: keystone: add pci error irq handler\0" "Date\0Tue, 19 Apr 2016 20:03:43 -0500\0" - "To\0Murali Karicheri <m-karicheri2@ti.com>\0" - "Cc\0bhelgaas@google.com" - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-pci@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>\0" + "Cc\0bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Hi Murali,\n" @@ -17,14 +18,14 @@ "> irq instead of standard msi/legacy irq. Add a simple error handler that\n" "> logs the fatal interrupt status to the console.\n" "> \n" - "> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>\n" - "> Acked-by: Rob Herring <robh@kernel.org>\n" - "> Cc: Rob Herring <robh+dt@kernel.org>\n" - "> Cc: Pawel Moll <pawel.moll@arm.com>\n" - "> Cc: Mark Rutland <mark.rutland@arm.com>\n" - "> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>\n" - "> Cc: Kumar Gala <galak@codeaurora.org>\n" - "> Cc: Bjorn Helgaas <bhelgaas@google.com>\n" + "> Signed-off-by: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>\n" + "> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "> Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "> Cc: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\n" + "> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\n" + "> Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>\n" + "> Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n" + "> Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n" "\n" "I applied this with minor changes to pci/host-keystone for v4.7.\n" "See below:\n" @@ -67,7 +68,7 @@ "\n" "\n" "commit 7be92716c1aa40f5690e6a5f01fc0d385dd72303\n" - "Author: Murali Karicheri <m-karicheri2@ti.com>\n" + "Author: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>\n" "Date: Mon Apr 11 10:50:30 2016 -0400\n" "\n" " PCI: keystone: Add error IRQ handler\n" @@ -77,13 +78,13 @@ " logs the fatal interrupt status to the console.\n" " \n" " [bhelgaas: tidy comments, return irqreturn_t directly]\n" - " Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>\n" - " Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>\n" - " Acked-by: Rob Herring <robh@kernel.org>\n" - " CC: Pawel Moll <pawel.moll@arm.com>\n" - " CC: Mark Rutland <mark.rutland@arm.com>\n" - " CC: Ian Campbell <ijc+devicetree@hellion.org.uk>\n" - " CC: Kumar Gala <galak@codeaurora.org>\n" + " Signed-off-by: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>\n" + " Signed-off-by: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n" + " Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + " CC: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\n" + " CC: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\n" + " CC: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>\n" + " CC: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n" "\n" "diff --git a/Documentation/devicetree/bindings/pci/pci-keystone.txt b/Documentation/devicetree/bindings/pci/pci-keystone.txt\n" "index 54eae29..d08a4d5 100644\n" @@ -251,6 +252,10 @@ "+\t\t\t\t\tvoid __iomem *reg_base);\n" " int ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,\n" " \t\t\tstruct device_node *msi_intc_np);\n" - int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, + " int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -7d0389ee724128cd13c3c155be0afadcf137c893cb6f4780f8fe1255557f6167 +bb34881faa94af2c3fe656f0d2b3f70cc86dd7a0b422bbbd89a00c335ddd5733
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.