diff for duplicates of <20060125112857.GB18584@miraclelinux.com> diff --git a/a/1.txt b/N1/1.txt index cf6230d..2c20434 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 6 files changed, 12 insertions(+), 13 deletions(-) Index: 2.6-git/arch/x86_64/kernel/mce.c -=================================--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/kernel/mce.c 2006-01-25 19:13:59.000000000 +0900 @@ -139,8 +139,7 @@ @@ -25,7 +26,8 @@ Index: 2.6-git/arch/x86_64/kernel/mce.c static inline void mce_get_rip(struct mce *m, struct pt_regs *regs) Index: 2.6-git/arch/x86_64/kernel/setup.c -=================================--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/kernel/setup.c 2006-01-25 19:13:59.000000000 +0900 @@ -1334,8 +1334,7 @@ { @@ -38,7 +40,8 @@ Index: 2.6-git/arch/x86_64/kernel/setup.c } Index: 2.6-git/include/asm-x86_64/mmu_context.h -=================================--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/include/asm-x86_64/mmu_context.h 2006-01-25 19:13:59.000000000 +0900 @@ -34,12 +34,12 @@ unsigned cpu = smp_processor_id(); @@ -65,28 +68,30 @@ Index: 2.6-git/include/asm-x86_64/mmu_context.h * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. Index: 2.6-git/arch/x86_64/pci/mmconfig.c -=================================--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/pci/mmconfig.c 2006-01-25 19:13:59.000000000 +0900 @@ -46,7 +46,7 @@ static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) { char __iomem *addr; -- if (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) -+ if (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), fallback_slots)) +- if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) ++ if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots)) return NULL; addr = get_virt(seg, bus); if (!addr) @@ -134,7 +134,7 @@ continue; addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0)); - if (addr = NULL|| readl(addr) != val1) { + if (addr == NULL|| readl(addr) != val1) { - set_bit(i, &fallback_slots); + set_bit(i, fallback_slots); } } } Index: 2.6-git/include/asm-x86_64/pgtable.h -=================================--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/include/asm-x86_64/pgtable.h 2006-01-25 19:13:59.000000000 +0900 @@ -293,19 +293,19 @@ { @@ -112,7 +117,8 @@ Index: 2.6-git/include/asm-x86_64/pgtable.h /* Index: 2.6-git/arch/ia64/kernel/mca.c -=================================--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/arch/ia64/kernel/mca.c 2006-01-25 19:14:01.000000000 +0900 @@ -69,6 +69,7 @@ #include <linux/kernel.h> diff --git a/a/content_digest b/N1/content_digest index bf9b2e9..e676ae1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020060125112625.GA18584@miraclelinux.com\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0[PATCH 1/6] {set,clear,test}_bit() related cleanup\0" - "Date\0Wed, 25 Jan 2006 11:28:57 +0000\0" + "Date\0Wed, 25 Jan 2006 20:28:57 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Richard Henderson <rth@twiddle.net>" Ivan Kokshaysky <ink@jurassic.park.msu.ru> @@ -13,7 +13,7 @@ Linus Torvalds <torvalds@osdl.org> linux-ia64@vger.kernel.org Hirokazu Takata <takata@linux-m32r.org> - linux-m68k@vger.kernel.org + linux-m68k@lists.linux-m68k.org Greg Ungerer <gerg@uclinux.org> linux-mips@linux-mips.org parisc-linux@parisc-linux.org @@ -42,7 +42,8 @@ " 6 files changed, 12 insertions(+), 13 deletions(-)\n" "\n" "Index: 2.6-git/arch/x86_64/kernel/mce.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/kernel/mce.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/kernel/mce.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/kernel/mce.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -139,8 +139,7 @@\n" " \n" @@ -55,7 +56,8 @@ " \n" " static inline void mce_get_rip(struct mce *m, struct pt_regs *regs)\n" "Index: 2.6-git/arch/x86_64/kernel/setup.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/kernel/setup.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/kernel/setup.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/kernel/setup.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -1334,8 +1334,7 @@\n" " \t{ \n" @@ -68,7 +70,8 @@ " \t}\n" " \t\t\n" "Index: 2.6-git/include/asm-x86_64/mmu_context.h\n" - "=================================--- 2.6-git.orig/include/asm-x86_64/mmu_context.h\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-x86_64/mmu_context.h\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/include/asm-x86_64/mmu_context.h\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -34,12 +34,12 @@\n" " \tunsigned cpu = smp_processor_id();\n" @@ -95,28 +98,30 @@ " \t\t\t * tlb flush IPI delivery. We must reload CR3\n" " \t\t\t * to make sure to use no freed page tables.\n" "Index: 2.6-git/arch/x86_64/pci/mmconfig.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -46,7 +46,7 @@\n" " static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)\n" " {\n" " \tchar __iomem *addr;\n" - "-\tif (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))\n" - "+\tif (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), fallback_slots))\n" + "-\tif (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))\n" + "+\tif (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots))\n" " \t\treturn NULL;\n" " \taddr = get_virt(seg, bus);\n" " \tif (!addr)\n" "@@ -134,7 +134,7 @@\n" " \t\t\tcontinue;\n" " \t\taddr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));\n" - " \t\tif (addr = NULL|| readl(addr) != val1) {\n" + " \t\tif (addr == NULL|| readl(addr) != val1) {\n" "-\t\t\tset_bit(i, &fallback_slots);\n" "+\t\t\tset_bit(i, fallback_slots);\n" " \t\t}\n" " \t}\n" " }\n" "Index: 2.6-git/include/asm-x86_64/pgtable.h\n" - "=================================--- 2.6-git.orig/include/asm-x86_64/pgtable.h\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-x86_64/pgtable.h\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/include/asm-x86_64/pgtable.h\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -293,19 +293,19 @@\n" " {\n" @@ -142,7 +147,8 @@ " \n" " /*\n" "Index: 2.6-git/arch/ia64/kernel/mca.c\n" - "=================================--- 2.6-git.orig/arch/ia64/kernel/mca.c\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/ia64/kernel/mca.c\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/arch/ia64/kernel/mca.c\t2006-01-25 19:14:01.000000000 +0900\n" "@@ -69,6 +69,7 @@\n" " #include <linux/kernel.h>\n" @@ -162,4 +168,4 @@ " \tp->parent = p->real_parent = p->group_leader = p;\n" " \tINIT_LIST_HEAD(&p->children);" -52c1264b228e818c597be4261e1835229813834acf9754c7ecd95954a716c970 +6c3b37a3f571f4b91e1225883d31c0b0bae0ebf94f9b9f64c7fa94e0c872064e
diff --git a/a/1.txt b/N2/1.txt index cf6230d..2c20434 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 6 files changed, 12 insertions(+), 13 deletions(-) Index: 2.6-git/arch/x86_64/kernel/mce.c -=================================--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/kernel/mce.c 2006-01-25 19:13:59.000000000 +0900 @@ -139,8 +139,7 @@ @@ -25,7 +26,8 @@ Index: 2.6-git/arch/x86_64/kernel/mce.c static inline void mce_get_rip(struct mce *m, struct pt_regs *regs) Index: 2.6-git/arch/x86_64/kernel/setup.c -=================================--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/kernel/setup.c 2006-01-25 19:13:59.000000000 +0900 @@ -1334,8 +1334,7 @@ { @@ -38,7 +40,8 @@ Index: 2.6-git/arch/x86_64/kernel/setup.c } Index: 2.6-git/include/asm-x86_64/mmu_context.h -=================================--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/include/asm-x86_64/mmu_context.h 2006-01-25 19:13:59.000000000 +0900 @@ -34,12 +34,12 @@ unsigned cpu = smp_processor_id(); @@ -65,28 +68,30 @@ Index: 2.6-git/include/asm-x86_64/mmu_context.h * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. Index: 2.6-git/arch/x86_64/pci/mmconfig.c -=================================--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/pci/mmconfig.c 2006-01-25 19:13:59.000000000 +0900 @@ -46,7 +46,7 @@ static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) { char __iomem *addr; -- if (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) -+ if (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), fallback_slots)) +- if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) ++ if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots)) return NULL; addr = get_virt(seg, bus); if (!addr) @@ -134,7 +134,7 @@ continue; addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0)); - if (addr = NULL|| readl(addr) != val1) { + if (addr == NULL|| readl(addr) != val1) { - set_bit(i, &fallback_slots); + set_bit(i, fallback_slots); } } } Index: 2.6-git/include/asm-x86_64/pgtable.h -=================================--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/include/asm-x86_64/pgtable.h 2006-01-25 19:13:59.000000000 +0900 @@ -293,19 +293,19 @@ { @@ -112,7 +117,8 @@ Index: 2.6-git/include/asm-x86_64/pgtable.h /* Index: 2.6-git/arch/ia64/kernel/mca.c -=================================--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/arch/ia64/kernel/mca.c 2006-01-25 19:14:01.000000000 +0900 @@ -69,6 +69,7 @@ #include <linux/kernel.h> diff --git a/a/content_digest b/N2/content_digest index bf9b2e9..b072da7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,31 +1,31 @@ "ref\020060125112625.GA18584@miraclelinux.com\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0[PATCH 1/6] {set,clear,test}_bit() related cleanup\0" - "Date\0Wed, 25 Jan 2006 11:28:57 +0000\0" + "Date\0Wed, 25 Jan 2006 20:28:57 +0900\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Richard Henderson <rth@twiddle.net>" - Ivan Kokshaysky <ink@jurassic.park.msu.ru> - Russell King <rmk@arm.linux.org.uk> + "Cc\0linux-mips@linux-mips.org" + linux-ia64@vger.kernel.org Ian Molton <spyro@f2s.com> - dev-etrax@axis.com David Howells <dhowells@redhat.com> - Yoshinori Sato <ysato@users.sourceforge.jp> + linuxppc-dev@ozlabs.org + Greg Ungerer <gerg@uclinux.org> + sparclinux@vger.kernel.org + Miles Bader <uclinux-v850@lsi.nec.co.jp> Linus Torvalds <torvalds@osdl.org> - linux-ia64@vger.kernel.org + Yoshinori Sato <ysato@users.sourceforge.jp> Hirokazu Takata <takata@linux-m32r.org> - linux-m68k@vger.kernel.org - Greg Ungerer <gerg@uclinux.org> - linux-mips@linux-mips.org - parisc-linux@parisc-linux.org - linuxppc-dev@ozlabs.org - linux390@de.ibm.com - linuxsh-dev@lists.sourceforge.net linuxsh-shmedia-dev@lists.sourceforge.net - sparclinux@vger.kernel.org + linux-m68k@lists.linux-m68k.org + Ivan Kokshaysky <ink@jurassic.park.msu.ru> + Richard Henderson <rth@twiddle.net> + Chris Zankel <chris@zankel.net> + dev-etrax@axis.com ultralinux@vger.kernel.org - Miles Bader <uclinux-v850@lsi.nec.co.jp> Andi Kleen <ak@suse.de> - " Chris Zankel <chris@zankel.net>\0" + linuxsh-dev@lists.sourceforge.net + linux390@de.ibm.com + Russell King <rmk@arm.linux.org.uk> + " parisc-linux@parisc-linux.org\0" "\00:1\0" "b\0" "While working on these patch set, I found several possible cleanup\n" @@ -42,7 +42,8 @@ " 6 files changed, 12 insertions(+), 13 deletions(-)\n" "\n" "Index: 2.6-git/arch/x86_64/kernel/mce.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/kernel/mce.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/kernel/mce.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/kernel/mce.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -139,8 +139,7 @@\n" " \n" @@ -55,7 +56,8 @@ " \n" " static inline void mce_get_rip(struct mce *m, struct pt_regs *regs)\n" "Index: 2.6-git/arch/x86_64/kernel/setup.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/kernel/setup.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/kernel/setup.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/kernel/setup.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -1334,8 +1334,7 @@\n" " \t{ \n" @@ -68,7 +70,8 @@ " \t}\n" " \t\t\n" "Index: 2.6-git/include/asm-x86_64/mmu_context.h\n" - "=================================--- 2.6-git.orig/include/asm-x86_64/mmu_context.h\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-x86_64/mmu_context.h\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/include/asm-x86_64/mmu_context.h\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -34,12 +34,12 @@\n" " \tunsigned cpu = smp_processor_id();\n" @@ -95,28 +98,30 @@ " \t\t\t * tlb flush IPI delivery. We must reload CR3\n" " \t\t\t * to make sure to use no freed page tables.\n" "Index: 2.6-git/arch/x86_64/pci/mmconfig.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -46,7 +46,7 @@\n" " static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)\n" " {\n" " \tchar __iomem *addr;\n" - "-\tif (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))\n" - "+\tif (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), fallback_slots))\n" + "-\tif (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))\n" + "+\tif (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots))\n" " \t\treturn NULL;\n" " \taddr = get_virt(seg, bus);\n" " \tif (!addr)\n" "@@ -134,7 +134,7 @@\n" " \t\t\tcontinue;\n" " \t\taddr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));\n" - " \t\tif (addr = NULL|| readl(addr) != val1) {\n" + " \t\tif (addr == NULL|| readl(addr) != val1) {\n" "-\t\t\tset_bit(i, &fallback_slots);\n" "+\t\t\tset_bit(i, fallback_slots);\n" " \t\t}\n" " \t}\n" " }\n" "Index: 2.6-git/include/asm-x86_64/pgtable.h\n" - "=================================--- 2.6-git.orig/include/asm-x86_64/pgtable.h\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-x86_64/pgtable.h\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/include/asm-x86_64/pgtable.h\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -293,19 +293,19 @@\n" " {\n" @@ -142,7 +147,8 @@ " \n" " /*\n" "Index: 2.6-git/arch/ia64/kernel/mca.c\n" - "=================================--- 2.6-git.orig/arch/ia64/kernel/mca.c\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/ia64/kernel/mca.c\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/arch/ia64/kernel/mca.c\t2006-01-25 19:14:01.000000000 +0900\n" "@@ -69,6 +69,7 @@\n" " #include <linux/kernel.h>\n" @@ -162,4 +168,4 @@ " \tp->parent = p->real_parent = p->group_leader = p;\n" " \tINIT_LIST_HEAD(&p->children);" -52c1264b228e818c597be4261e1835229813834acf9754c7ecd95954a716c970 +e58a123c3c7057188a0fcc5f71ecdc128f4a44cc6f1583d642af75331eecd243
diff --git a/a/content_digest b/N3/content_digest index bf9b2e9..239e6b9 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -13,7 +13,7 @@ Linus Torvalds <torvalds@osdl.org> linux-ia64@vger.kernel.org Hirokazu Takata <takata@linux-m32r.org> - linux-m68k@vger.kernel.org + linux-m68k@lists.linux-m68k.org Greg Ungerer <gerg@uclinux.org> linux-mips@linux-mips.org parisc-linux@parisc-linux.org @@ -162,4 +162,4 @@ " \tp->parent = p->real_parent = p->group_leader = p;\n" " \tINIT_LIST_HEAD(&p->children);" -52c1264b228e818c597be4261e1835229813834acf9754c7ecd95954a716c970 +e1af32ffc1ccffbcd396518c146dea7022bf7880f73b5bc1efabcaf96cfb4e5d
diff --git a/a/1.txt b/N4/1.txt index cf6230d..2c20434 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 6 files changed, 12 insertions(+), 13 deletions(-) Index: 2.6-git/arch/x86_64/kernel/mce.c -=================================--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/kernel/mce.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/kernel/mce.c 2006-01-25 19:13:59.000000000 +0900 @@ -139,8 +139,7 @@ @@ -25,7 +26,8 @@ Index: 2.6-git/arch/x86_64/kernel/mce.c static inline void mce_get_rip(struct mce *m, struct pt_regs *regs) Index: 2.6-git/arch/x86_64/kernel/setup.c -=================================--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/kernel/setup.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/kernel/setup.c 2006-01-25 19:13:59.000000000 +0900 @@ -1334,8 +1334,7 @@ { @@ -38,7 +40,8 @@ Index: 2.6-git/arch/x86_64/kernel/setup.c } Index: 2.6-git/include/asm-x86_64/mmu_context.h -=================================--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-x86_64/mmu_context.h 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/include/asm-x86_64/mmu_context.h 2006-01-25 19:13:59.000000000 +0900 @@ -34,12 +34,12 @@ unsigned cpu = smp_processor_id(); @@ -65,28 +68,30 @@ Index: 2.6-git/include/asm-x86_64/mmu_context.h * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. Index: 2.6-git/arch/x86_64/pci/mmconfig.c -=================================--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/arch/x86_64/pci/mmconfig.c 2006-01-25 19:13:59.000000000 +0900 @@ -46,7 +46,7 @@ static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) { char __iomem *addr; -- if (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) -+ if (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), fallback_slots)) +- if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) ++ if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots)) return NULL; addr = get_virt(seg, bus); if (!addr) @@ -134,7 +134,7 @@ continue; addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0)); - if (addr = NULL|| readl(addr) != val1) { + if (addr == NULL|| readl(addr) != val1) { - set_bit(i, &fallback_slots); + set_bit(i, fallback_slots); } } } Index: 2.6-git/include/asm-x86_64/pgtable.h -=================================--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-x86_64/pgtable.h 2006-01-25 19:07:15.000000000 +0900 +++ 2.6-git/include/asm-x86_64/pgtable.h 2006-01-25 19:13:59.000000000 +0900 @@ -293,19 +293,19 @@ { @@ -112,7 +117,8 @@ Index: 2.6-git/include/asm-x86_64/pgtable.h /* Index: 2.6-git/arch/ia64/kernel/mca.c -=================================--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/arch/ia64/kernel/mca.c 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/arch/ia64/kernel/mca.c 2006-01-25 19:14:01.000000000 +0900 @@ -69,6 +69,7 @@ #include <linux/kernel.h> diff --git a/a/content_digest b/N4/content_digest index bf9b2e9..e8ff6f9 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020060125112625.GA18584@miraclelinux.com\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0[PATCH 1/6] {set,clear,test}_bit() related cleanup\0" - "Date\0Wed, 25 Jan 2006 11:28:57 +0000\0" + "Date\0Wed, 25 Jan 2006 20:28:57 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Richard Henderson <rth@twiddle.net>" Ivan Kokshaysky <ink@jurassic.park.msu.ru> @@ -42,7 +42,8 @@ " 6 files changed, 12 insertions(+), 13 deletions(-)\n" "\n" "Index: 2.6-git/arch/x86_64/kernel/mce.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/kernel/mce.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/kernel/mce.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/kernel/mce.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -139,8 +139,7 @@\n" " \n" @@ -55,7 +56,8 @@ " \n" " static inline void mce_get_rip(struct mce *m, struct pt_regs *regs)\n" "Index: 2.6-git/arch/x86_64/kernel/setup.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/kernel/setup.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/kernel/setup.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/kernel/setup.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -1334,8 +1334,7 @@\n" " \t{ \n" @@ -68,7 +70,8 @@ " \t}\n" " \t\t\n" "Index: 2.6-git/include/asm-x86_64/mmu_context.h\n" - "=================================--- 2.6-git.orig/include/asm-x86_64/mmu_context.h\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-x86_64/mmu_context.h\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/include/asm-x86_64/mmu_context.h\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -34,12 +34,12 @@\n" " \tunsigned cpu = smp_processor_id();\n" @@ -95,28 +98,30 @@ " \t\t\t * tlb flush IPI delivery. We must reload CR3\n" " \t\t\t * to make sure to use no freed page tables.\n" "Index: 2.6-git/arch/x86_64/pci/mmconfig.c\n" - "=================================--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/arch/x86_64/pci/mmconfig.c\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -46,7 +46,7 @@\n" " static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)\n" " {\n" " \tchar __iomem *addr;\n" - "-\tif (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))\n" - "+\tif (seg = 0 && bus = 0 && test_bit(PCI_SLOT(devfn), fallback_slots))\n" + "-\tif (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots))\n" + "+\tif (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), fallback_slots))\n" " \t\treturn NULL;\n" " \taddr = get_virt(seg, bus);\n" " \tif (!addr)\n" "@@ -134,7 +134,7 @@\n" " \t\t\tcontinue;\n" " \t\taddr = pci_dev_base(0, 0, PCI_DEVFN(i, 0));\n" - " \t\tif (addr = NULL|| readl(addr) != val1) {\n" + " \t\tif (addr == NULL|| readl(addr) != val1) {\n" "-\t\t\tset_bit(i, &fallback_slots);\n" "+\t\t\tset_bit(i, fallback_slots);\n" " \t\t}\n" " \t}\n" " }\n" "Index: 2.6-git/include/asm-x86_64/pgtable.h\n" - "=================================--- 2.6-git.orig/include/asm-x86_64/pgtable.h\t2006-01-25 19:07:15.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-x86_64/pgtable.h\t2006-01-25 19:07:15.000000000 +0900\n" "+++ 2.6-git/include/asm-x86_64/pgtable.h\t2006-01-25 19:13:59.000000000 +0900\n" "@@ -293,19 +293,19 @@\n" " {\n" @@ -142,7 +147,8 @@ " \n" " /*\n" "Index: 2.6-git/arch/ia64/kernel/mca.c\n" - "=================================--- 2.6-git.orig/arch/ia64/kernel/mca.c\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/ia64/kernel/mca.c\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/arch/ia64/kernel/mca.c\t2006-01-25 19:14:01.000000000 +0900\n" "@@ -69,6 +69,7 @@\n" " #include <linux/kernel.h>\n" @@ -162,4 +168,4 @@ " \tp->parent = p->real_parent = p->group_leader = p;\n" " \tINIT_LIST_HEAD(&p->children);" -52c1264b228e818c597be4261e1835229813834acf9754c7ecd95954a716c970 +8f96ef7c3e7f265ce8d224d97e39ba8e930bcea683fe629be4de33b0414da391
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.