diff for duplicates of <20060201090332.136237000@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 0e2b15d..855b9b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 3 files changed, 19 insertions(+), 239 deletions(-) Index: 2.6-git/include/asm-ia64/bitops.h -=================================--- 2.6-git.orig/include/asm-ia64/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-ia64/bitops.h +++ 2.6-git/include/asm-ia64/bitops.h @@ -5,8 +5,8 @@ * Copyright (C) 1998-2003 Hewlett-Packard Co @@ -267,7 +268,8 @@ Index: 2.6-git/include/asm-ia64/bitops.h #endif /* __KERNEL__ */ Index: 2.6-git/arch/ia64/lib/Makefile -=================================--- 2.6-git.orig/arch/ia64/lib/Makefile +=================================================================== +--- 2.6-git.orig/arch/ia64/lib/Makefile +++ 2.6-git/arch/ia64/lib/Makefile @@ -6,7 +6,7 @@ obj-y := io.o @@ -279,7 +281,8 @@ Index: 2.6-git/arch/ia64/lib/Makefile flush.o ip_fast_csum.o do_csum.o \ memset.o strlen.o Index: 2.6-git/arch/ia64/lib/bitop.c -=================================--- 2.6-git.orig/arch/ia64/lib/bitop.c +=================================================================== +--- 2.6-git.orig/arch/ia64/lib/bitop.c +++ /dev/null @@ -1,88 +0,0 @@ -#include <linux/compiler.h> @@ -323,7 +326,7 @@ Index: 2.6-git/arch/ia64/lib/bitop.c - tmp = *p; -found_first: - tmp |= ~0UL << size; -- if (tmp = ~0UL) /* any bits zero? */ +- if (tmp == ~0UL) /* any bits zero? */ - return result + size; /* nope */ -found_middle: - return result + ffz(tmp); @@ -364,7 +367,7 @@ Index: 2.6-git/arch/ia64/lib/bitop.c - tmp = *p; - found_first: - tmp &= ~0UL >> (64-size); -- if (tmp = 0UL) /* Are any bits set? */ +- if (tmp == 0UL) /* Are any bits set? */ - return result + size; /* Nope. */ - found_middle: - return result + __ffs(tmp); diff --git a/a/content_digest b/N1/content_digest index c8e9a1b..8c3fe87 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,12 @@ "ref\020060201090224.536581000@localhost.localdomain\0" "From\0Akinobu Mita <mita@miraclelinux.com>\0" "Subject\0[patch 25/44] ia64: use generic bitops\0" - "Date\0Wed, 01 Feb 2006 09:02:49 +0000\0" + "Date\0Wed, 01 Feb 2006 18:02:49 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0linux-ia64@vger.kernel.org" " Akinobu Mita <mita@miraclelinux.com>\0" "\00:1\0" + "fn\0ia64.patch\0" "b\0" "- remove __{,test_and_}{set,clear,change}_bit() and test_bit()\n" "- remove generic_fls64()\n" @@ -21,7 +22,8 @@ " 3 files changed, 19 insertions(+), 239 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-ia64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-ia64/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-ia64/bitops.h\n" "+++ 2.6-git/include/asm-ia64/bitops.h\n" "@@ -5,8 +5,8 @@\n" " * Copyright (C) 1998-2003 Hewlett-Packard Co\n" @@ -276,7 +278,8 @@ " #endif /* __KERNEL__ */\n" " \n" "Index: 2.6-git/arch/ia64/lib/Makefile\n" - "=================================--- 2.6-git.orig/arch/ia64/lib/Makefile\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/ia64/lib/Makefile\n" "+++ 2.6-git/arch/ia64/lib/Makefile\n" "@@ -6,7 +6,7 @@ obj-y := io.o\n" " \n" @@ -288,7 +291,8 @@ " \tflush.o ip_fast_csum.o do_csum.o\t\t\t\t\\\n" " \tmemset.o strlen.o\n" "Index: 2.6-git/arch/ia64/lib/bitop.c\n" - "=================================--- 2.6-git.orig/arch/ia64/lib/bitop.c\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/ia64/lib/bitop.c\n" "+++ /dev/null\n" "@@ -1,88 +0,0 @@\n" "-#include <linux/compiler.h>\n" @@ -332,7 +336,7 @@ "-\ttmp = *p;\n" "-found_first:\n" "-\ttmp |= ~0UL << size;\n" - "-\tif (tmp = ~0UL)\t\t/* any bits zero? */\n" + "-\tif (tmp == ~0UL)\t\t/* any bits zero? */\n" "-\t\treturn result + size;\t/* nope */\n" "-found_middle:\n" "-\treturn result + ffz(tmp);\n" @@ -373,7 +377,7 @@ "-\ttmp = *p;\n" "- found_first:\n" "-\ttmp &= ~0UL >> (64-size);\n" - "-\tif (tmp = 0UL)\t\t/* Are any bits set? */\n" + "-\tif (tmp == 0UL)\t\t/* Are any bits set? */\n" "-\t\treturn result + size; /* Nope. */\n" "- found_middle:\n" "-\treturn result + __ffs(tmp);\n" @@ -382,4 +386,4 @@ "\n" -- -0ee16bab602d5454d0cd6d103b5be4d55bb4e328863d0abf2bf11fd4a6dbd560 +5c1e3eb86821c12c30e43f2ecc875dc3ca62789d6918354fa92f78a5b57803a7
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.