diff for duplicates of <20140527223436.GD11907@google.com> diff --git a/a/1.txt b/N1/1.txt index a0ba7fe..332d2ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -125,7 +125,7 @@ Applied with Arnd's ack to pci/misc for v3.16, thanks. > +++ b/arch/ia64/include/asm/pci.h > @@ -50,12 +50,6 @@ struct pci_dev; > extern unsigned long ia64_max_iommu_merge_mask; -> #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask = ~0UL) +> #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL) > > -static inline void > -pcibios_penalize_isa_irq (int irq, int active) diff --git a/a/content_digest b/N1/content_digest index 88a8572..472ac7f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01399346992-6584-1-git-send-email-hanjun.guo@linaro.org\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH] PCI: Turn pcibios_penalize_isa_irq() into __weak function\0" - "Date\0Tue, 27 May 2014 22:34:36 +0000\0" + "Date\0Tue, 27 May 2014 16:34:36 -0600\0" "To\0Hanjun Guo <hanjun.guo@linaro.org>\0" "Cc\0Arnd Bergmann <arnd@arndb.de>" Will Deacon <will.deacon@arm.com> @@ -142,7 +142,7 @@ "> +++ b/arch/ia64/include/asm/pci.h\n" "> @@ -50,12 +50,6 @@ struct pci_dev;\n" "> extern unsigned long ia64_max_iommu_merge_mask;\n" - "> #define PCI_DMA_BUS_IS_PHYS\t(ia64_max_iommu_merge_mask = ~0UL)\n" + "> #define PCI_DMA_BUS_IS_PHYS\t(ia64_max_iommu_merge_mask == ~0UL)\n" "> \n" "> -static inline void\n" "> -pcibios_penalize_isa_irq (int irq, int active)\n" @@ -374,4 +374,4 @@ "> 1.7.9.5\n" > -c345c2b6890253dc1adf57fe652e3e566da03376a07b4973c2782d064ad64a83 +4e8b1f62d4ffc057b0184e7607b40b6c8d4ace1fd3bd2abbf624fb5a19a45b1e
diff --git a/a/1.txt b/N2/1.txt index a0ba7fe..332d2ff 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -125,7 +125,7 @@ Applied with Arnd's ack to pci/misc for v3.16, thanks. > +++ b/arch/ia64/include/asm/pci.h > @@ -50,12 +50,6 @@ struct pci_dev; > extern unsigned long ia64_max_iommu_merge_mask; -> #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask = ~0UL) +> #define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL) > > -static inline void > -pcibios_penalize_isa_irq (int irq, int active) diff --git a/a/content_digest b/N2/content_digest index 88a8572..7b82d03 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,18 +1,8 @@ "ref\01399346992-6584-1-git-send-email-hanjun.guo@linaro.org\0" - "From\0Bjorn Helgaas <bhelgaas@google.com>\0" - "Subject\0Re: [PATCH] PCI: Turn pcibios_penalize_isa_irq() into __weak function\0" - "Date\0Tue, 27 May 2014 22:34:36 +0000\0" - "To\0Hanjun Guo <hanjun.guo@linaro.org>\0" - "Cc\0Arnd Bergmann <arnd@arndb.de>" - Will Deacon <will.deacon@arm.com> - Tony Luck <tony.luck@intel.com> - Yijing Wang <wangyijing@huawei.com> - Thomas Gleixner <tglx@linutronix.de> - linux-pci@vger.kernel.org - x86@kernel.org - linux-ia64@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linaro-acpi@lists.linaro.org\0" + "From\0bhelgaas@google.com (Bjorn Helgaas)\0" + "Subject\0[PATCH] PCI: Turn pcibios_penalize_isa_irq() into __weak function\0" + "Date\0Tue, 27 May 2014 16:34:36 -0600\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, May 06, 2014 at 11:29:52AM +0800, Hanjun Guo wrote:\n" @@ -142,7 +132,7 @@ "> +++ b/arch/ia64/include/asm/pci.h\n" "> @@ -50,12 +50,6 @@ struct pci_dev;\n" "> extern unsigned long ia64_max_iommu_merge_mask;\n" - "> #define PCI_DMA_BUS_IS_PHYS\t(ia64_max_iommu_merge_mask = ~0UL)\n" + "> #define PCI_DMA_BUS_IS_PHYS\t(ia64_max_iommu_merge_mask == ~0UL)\n" "> \n" "> -static inline void\n" "> -pcibios_penalize_isa_irq (int irq, int active)\n" @@ -374,4 +364,4 @@ "> 1.7.9.5\n" > -c345c2b6890253dc1adf57fe652e3e566da03376a07b4973c2782d064ad64a83 +a0de5113e86660e3d4aba64ed9d13be4218fdcf0f8bcb961f2d3240208e06348
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.