diff for duplicates of <1107457685.12618.23.camel@eeyore> diff --git a/a/1.txt b/N1/1.txt index a780e4e..16f6770 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,8 @@ ia64: Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> -=== arch/i386/pci/direct.c 1.19 vs edited ==--- 1.19/arch/i386/pci/direct.c 2004-01-04 22:54:04 -07:00 +===== arch/i386/pci/direct.c 1.19 vs edited ===== +--- 1.19/arch/i386/pci/direct.c 2004-01-04 22:54:04 -07:00 +++ edited/arch/i386/pci/direct.c 2005-02-03 11:08:21 -07:00 @@ -13,7 +13,8 @@ #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ @@ -64,7 +65,8 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> { unsigned long flags; int dev, fn; -=== arch/i386/pci/mmconfig.c 1.5 vs edited ==--- 1.5/arch/i386/pci/mmconfig.c 2004-11-29 12:13:05 -07:00 +===== arch/i386/pci/mmconfig.c 1.5 vs edited ===== +--- 1.5/arch/i386/pci/mmconfig.c 2004-11-29 12:13:05 -07:00 +++ edited/arch/i386/pci/mmconfig.c 2005-02-03 11:08:21 -07:00 @@ -34,7 +34,8 @@ } @@ -86,7 +88,8 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> { unsigned long flags; -=== arch/i386/pci/numa.c 1.18 vs edited ==--- 1.18/arch/i386/pci/numa.c 2005-01-20 21:58:10 -07:00 +===== arch/i386/pci/numa.c 1.18 vs edited ===== +--- 1.18/arch/i386/pci/numa.c 2005-01-20 21:58:10 -07:00 +++ edited/arch/i386/pci/numa.c 2005-02-03 11:55:05 -07:00 @@ -14,7 +14,8 @@ #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \ @@ -108,7 +111,8 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> { unsigned long flags; -=== arch/i386/pci/pcbios.c 1.18 vs edited ==--- 1.18/arch/i386/pci/pcbios.c 2005-01-14 16:07:29 -07:00 +===== arch/i386/pci/pcbios.c 1.18 vs edited ===== +--- 1.18/arch/i386/pci/pcbios.c 2005-01-14 16:07:29 -07:00 +++ edited/arch/i386/pci/pcbios.c 2005-02-03 11:08:21 -07:00 @@ -172,7 +172,8 @@ return (int) (ret & 0xff00) >> 8; @@ -130,7 +134,8 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> { unsigned long result = 0; unsigned long flags; -=== arch/ia64/pci/pci.c 1.67 vs edited ==--- 1.67/arch/ia64/pci/pci.c 2005-01-25 14:23:42 -07:00 +===== arch/ia64/pci/pci.c 1.67 vs edited ===== +--- 1.67/arch/ia64/pci/pci.c 2005-01-25 14:23:42 -07:00 +++ edited/arch/ia64/pci/pci.c 2005-02-03 11:08:22 -07:00 @@ -3,9 +3,9 @@ * @@ -240,7 +245,8 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> } static struct pci_raw_ops pci_sal_ops = { -=== arch/x86_64/pci/mmconfig.c 1.4 vs edited ==--- 1.4/arch/x86_64/pci/mmconfig.c 2004-11-29 12:13:05 -07:00 +===== arch/x86_64/pci/mmconfig.c 1.4 vs edited ===== +--- 1.4/arch/x86_64/pci/mmconfig.c 2004-11-29 12:13:05 -07:00 +++ edited/arch/x86_64/pci/mmconfig.c 2005-02-03 11:08:22 -07:00 @@ -17,12 +17,13 @@ /* Static virtual mapping of the MMCONFIG aperture */ @@ -268,7 +274,8 @@ Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> { char *addr = pci_dev_base(bus,devfn); -=== include/linux/pci.h 1.148 vs edited ==--- 1.148/include/linux/pci.h 2005-01-20 21:59:15 -07:00 +===== include/linux/pci.h 1.148 vs edited ===== +--- 1.148/include/linux/pci.h 2005-01-20 21:59:15 -07:00 +++ edited/include/linux/pci.h 2005-02-03 11:08:22 -07:00 @@ -642,8 +642,10 @@ }; diff --git a/a/content_digest b/N1/content_digest index 0864cc1..a44fd99 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Bjorn Helgaas <bjorn.helgaas@hp.com>\0" "Subject\0[PATCH] pci_raw_ops should use unsigned args\0" - "Date\0Thu, 03 Feb 2005 19:08:05 +0000\0" + "Date\0Thu, 03 Feb 2005 12:08:05 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linux-pci@atrey.karlin.mff.cuni.cz @@ -32,7 +32,8 @@ "\n" "Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>\n" "\n" - "=== arch/i386/pci/direct.c 1.19 vs edited ==--- 1.19/arch/i386/pci/direct.c\t2004-01-04 22:54:04 -07:00\n" + "===== arch/i386/pci/direct.c 1.19 vs edited =====\n" + "--- 1.19/arch/i386/pci/direct.c\t2004-01-04 22:54:04 -07:00\n" "+++ edited/arch/i386/pci/direct.c\t2005-02-03 11:08:21 -07:00\n" "@@ -13,7 +13,8 @@\n" " #define PCI_CONF1_ADDRESS(bus, devfn, reg) \\\n" @@ -74,7 +75,8 @@ " {\n" " \tunsigned long flags;\n" " \tint dev, fn;\n" - "=== arch/i386/pci/mmconfig.c 1.5 vs edited ==--- 1.5/arch/i386/pci/mmconfig.c\t2004-11-29 12:13:05 -07:00\n" + "===== arch/i386/pci/mmconfig.c 1.5 vs edited =====\n" + "--- 1.5/arch/i386/pci/mmconfig.c\t2004-11-29 12:13:05 -07:00\n" "+++ edited/arch/i386/pci/mmconfig.c\t2005-02-03 11:08:21 -07:00\n" "@@ -34,7 +34,8 @@\n" " \t}\n" @@ -96,7 +98,8 @@ " {\n" " \tunsigned long flags;\n" " \n" - "=== arch/i386/pci/numa.c 1.18 vs edited ==--- 1.18/arch/i386/pci/numa.c\t2005-01-20 21:58:10 -07:00\n" + "===== arch/i386/pci/numa.c 1.18 vs edited =====\n" + "--- 1.18/arch/i386/pci/numa.c\t2005-01-20 21:58:10 -07:00\n" "+++ edited/arch/i386/pci/numa.c\t2005-02-03 11:55:05 -07:00\n" "@@ -14,7 +14,8 @@\n" " #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \\\n" @@ -118,7 +121,8 @@ " {\n" " \tunsigned long flags;\n" " \n" - "=== arch/i386/pci/pcbios.c 1.18 vs edited ==--- 1.18/arch/i386/pci/pcbios.c\t2005-01-14 16:07:29 -07:00\n" + "===== arch/i386/pci/pcbios.c 1.18 vs edited =====\n" + "--- 1.18/arch/i386/pci/pcbios.c\t2005-01-14 16:07:29 -07:00\n" "+++ edited/arch/i386/pci/pcbios.c\t2005-02-03 11:08:21 -07:00\n" "@@ -172,7 +172,8 @@\n" " \treturn (int) (ret & 0xff00) >> 8;\n" @@ -140,7 +144,8 @@ " {\n" " \tunsigned long result = 0;\n" " \tunsigned long flags;\n" - "=== arch/ia64/pci/pci.c 1.67 vs edited ==--- 1.67/arch/ia64/pci/pci.c\t2005-01-25 14:23:42 -07:00\n" + "===== arch/ia64/pci/pci.c 1.67 vs edited =====\n" + "--- 1.67/arch/ia64/pci/pci.c\t2005-01-25 14:23:42 -07:00\n" "+++ edited/arch/ia64/pci/pci.c\t2005-02-03 11:08:22 -07:00\n" "@@ -3,9 +3,9 @@\n" " *\n" @@ -250,7 +255,8 @@ " }\n" " \n" " static struct pci_raw_ops pci_sal_ops = {\n" - "=== arch/x86_64/pci/mmconfig.c 1.4 vs edited ==--- 1.4/arch/x86_64/pci/mmconfig.c\t2004-11-29 12:13:05 -07:00\n" + "===== arch/x86_64/pci/mmconfig.c 1.4 vs edited =====\n" + "--- 1.4/arch/x86_64/pci/mmconfig.c\t2004-11-29 12:13:05 -07:00\n" "+++ edited/arch/x86_64/pci/mmconfig.c\t2005-02-03 11:08:22 -07:00\n" "@@ -17,12 +17,13 @@\n" " /* Static virtual mapping of the MMCONFIG aperture */\n" @@ -278,7 +284,8 @@ " {\n" " \tchar *addr = pci_dev_base(bus,devfn);\n" " \n" - "=== include/linux/pci.h 1.148 vs edited ==--- 1.148/include/linux/pci.h\t2005-01-20 21:59:15 -07:00\n" + "===== include/linux/pci.h 1.148 vs edited =====\n" + "--- 1.148/include/linux/pci.h\t2005-01-20 21:59:15 -07:00\n" "+++ edited/include/linux/pci.h\t2005-02-03 11:08:22 -07:00\n" "@@ -642,8 +642,10 @@\n" " };\n" @@ -294,4 +301,4 @@ " \n" extern struct pci_raw_ops *raw_pci_ops; -6029b947b4d1ce3e990059aea189daaa9f11bd89a71203a837b677763b8b16bb +fb9ee172f1f6766e6d76efae801c3762cf21ded35c96bf534b489e24ee82b956
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.