diff for duplicates of <20060125113033.GC18584@miraclelinux.com> diff --git a/a/1.txt b/N1/1.txt index 1375de8..d56507f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 10 files changed, 40 insertions(+), 52 deletions(-) Index: 2.6-git/include/asm-h8300/bitops.h -=================================--- 2.6-git.orig/include/asm-h8300/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-h8300/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-h8300/bitops.h 2006-01-25 19:14:01.000000000 +0900 @@ -397,9 +397,9 @@ } @@ -37,7 +38,8 @@ Index: 2.6-git/include/asm-h8300/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-ia64/bitops.h -=================================--- 2.6-git.orig/include/asm-ia64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-ia64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-ia64/bitops.h 2006-01-25 19:14:02.000000000 +0900 @@ -394,18 +394,18 @@ @@ -64,7 +66,8 @@ Index: 2.6-git/include/asm-ia64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-mips/bitops.h -=================================--- 2.6-git.orig/include/asm-mips/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-mips/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-mips/bitops.h 2006-01-25 19:14:05.000000000 +0900 @@ -956,9 +956,9 @@ * FIXME: These assume that Minix uses the native byte/bitorder. @@ -80,7 +83,8 @@ Index: 2.6-git/include/asm-mips/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-s390/bitops.h -=================================--- 2.6-git.orig/include/asm-s390/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-s390/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-s390/bitops.h 2006-01-25 19:14:05.000000000 +0900 @@ -871,11 +871,11 @@ */ @@ -112,7 +116,8 @@ Index: 2.6-git/include/asm-s390/bitops.h test_bit(nr,(unsigned long *)addr) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sh/bitops.h -=================================--- 2.6-git.orig/include/asm-sh/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sh/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sh/bitops.h 2006-01-25 19:14:06.000000000 +0900 @@ -339,8 +339,8 @@ } @@ -170,7 +175,8 @@ Index: 2.6-git/include/asm-sh/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sh64/bitops.h -=================================--- 2.6-git.orig/include/asm-sh64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sh64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sh64/bitops.h 2006-01-25 19:14:07.000000000 +0900 @@ -382,8 +382,8 @@ #define hweight8(x) generic_hweight8(x) @@ -228,7 +234,8 @@ Index: 2.6-git/include/asm-sh64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sparc/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sparc/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sparc/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -523,11 +523,11 @@ @@ -246,7 +253,8 @@ Index: 2.6-git/include/asm-sparc/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sparc64/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sparc64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sparc64/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -280,11 +280,11 @@ @@ -264,7 +272,8 @@ Index: 2.6-git/include/asm-sparc64/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-v850/bitops.h -=================================--- 2.6-git.orig/include/asm-v850/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-v850/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-v850/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -336,18 +336,18 @@ #define hweight16(x) generic_hweight16 (x) @@ -291,7 +300,8 @@ Index: 2.6-git/include/asm-v850/bitops.h #define minix_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-xtensa/bitops.h -=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-xtensa/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-xtensa/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -436,9 +436,9 @@ diff --git a/a/content_digest b/N1/content_digest index 61bbe3f..9649bca 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 2/6] use non atomic operations for minix_*_bit() and ext2_*_bit()\0" - "Date\0Wed, 25 Jan 2006 11:30:33 +0000\0" + "Date\0Wed, 25 Jan 2006 20:30:33 +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 @@ -51,7 +51,8 @@ " 10 files changed, 40 insertions(+), 52 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-h8300/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-h8300/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-h8300/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-h8300/bitops.h\t2006-01-25 19:14:01.000000000 +0900\n" "@@ -397,9 +397,9 @@\n" " }\n" @@ -67,7 +68,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-ia64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-ia64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-ia64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-ia64/bitops.h\t2006-01-25 19:14:02.000000000 +0900\n" "@@ -394,18 +394,18 @@\n" " \n" @@ -94,7 +96,8 @@ " #define minix_find_first_zero_bit(addr,size)\tfind_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-mips/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-mips/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-mips/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-mips/bitops.h\t2006-01-25 19:14:05.000000000 +0900\n" "@@ -956,9 +956,9 @@\n" " * FIXME: These assume that Minix uses the native byte/bitorder.\n" @@ -110,7 +113,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-s390/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-s390/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-s390/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-s390/bitops.h\t2006-01-25 19:14:05.000000000 +0900\n" "@@ -871,11 +871,11 @@\n" " */\n" @@ -142,7 +146,8 @@ " \ttest_bit(nr,(unsigned long *)addr)\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sh/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sh/bitops.h\t2006-01-25 19:14:06.000000000 +0900\n" "@@ -339,8 +339,8 @@\n" " }\n" @@ -200,7 +205,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sh64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sh64/bitops.h\t2006-01-25 19:14:07.000000000 +0900\n" "@@ -382,8 +382,8 @@\n" " #define hweight8(x) generic_hweight8(x)\n" @@ -258,7 +264,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sparc/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sparc/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -523,11 +523,11 @@\n" " \n" @@ -276,7 +283,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sparc64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sparc64/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -280,11 +280,11 @@\n" " \n" @@ -294,7 +302,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-v850/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-v850/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-v850/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-v850/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -336,18 +336,18 @@\n" " #define hweight16(x) \t\t\tgeneric_hweight16 (x)\n" @@ -321,7 +330,8 @@ " #define minix_find_first_zero_bit \tfind_first_zero_bit\n" " \n" "Index: 2.6-git/include/asm-xtensa/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-xtensa/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-xtensa/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -436,9 +436,9 @@\n" " \n" @@ -336,4 +346,4 @@ " #define minix_test_bit(nr,addr) test_bit(nr,addr)\n" #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) -4cd22286776dafe4758c16225ba690b0a6ff83b11598b4ccf591742e2018b0fa +947576ee6ffb34077d6017cda7415215ea120f9fde45fba2f72ed5eb4f90ce5c
diff --git a/a/1.txt b/N2/1.txt index 1375de8..d56507f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,7 +21,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 10 files changed, 40 insertions(+), 52 deletions(-) Index: 2.6-git/include/asm-h8300/bitops.h -=================================--- 2.6-git.orig/include/asm-h8300/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-h8300/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-h8300/bitops.h 2006-01-25 19:14:01.000000000 +0900 @@ -397,9 +397,9 @@ } @@ -37,7 +38,8 @@ Index: 2.6-git/include/asm-h8300/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-ia64/bitops.h -=================================--- 2.6-git.orig/include/asm-ia64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-ia64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-ia64/bitops.h 2006-01-25 19:14:02.000000000 +0900 @@ -394,18 +394,18 @@ @@ -64,7 +66,8 @@ Index: 2.6-git/include/asm-ia64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-mips/bitops.h -=================================--- 2.6-git.orig/include/asm-mips/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-mips/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-mips/bitops.h 2006-01-25 19:14:05.000000000 +0900 @@ -956,9 +956,9 @@ * FIXME: These assume that Minix uses the native byte/bitorder. @@ -80,7 +83,8 @@ Index: 2.6-git/include/asm-mips/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-s390/bitops.h -=================================--- 2.6-git.orig/include/asm-s390/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-s390/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-s390/bitops.h 2006-01-25 19:14:05.000000000 +0900 @@ -871,11 +871,11 @@ */ @@ -112,7 +116,8 @@ Index: 2.6-git/include/asm-s390/bitops.h test_bit(nr,(unsigned long *)addr) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sh/bitops.h -=================================--- 2.6-git.orig/include/asm-sh/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sh/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sh/bitops.h 2006-01-25 19:14:06.000000000 +0900 @@ -339,8 +339,8 @@ } @@ -170,7 +175,8 @@ Index: 2.6-git/include/asm-sh/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sh64/bitops.h -=================================--- 2.6-git.orig/include/asm-sh64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sh64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sh64/bitops.h 2006-01-25 19:14:07.000000000 +0900 @@ -382,8 +382,8 @@ #define hweight8(x) generic_hweight8(x) @@ -228,7 +234,8 @@ Index: 2.6-git/include/asm-sh64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sparc/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sparc/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sparc/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -523,11 +523,11 @@ @@ -246,7 +253,8 @@ Index: 2.6-git/include/asm-sparc/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sparc64/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sparc64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sparc64/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -280,11 +280,11 @@ @@ -264,7 +272,8 @@ Index: 2.6-git/include/asm-sparc64/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-v850/bitops.h -=================================--- 2.6-git.orig/include/asm-v850/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-v850/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-v850/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -336,18 +336,18 @@ #define hweight16(x) generic_hweight16 (x) @@ -291,7 +300,8 @@ Index: 2.6-git/include/asm-v850/bitops.h #define minix_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-xtensa/bitops.h -=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-xtensa/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-xtensa/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -436,9 +436,9 @@ diff --git a/a/content_digest b/N2/content_digest index 61bbe3f..f03d810 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 2/6] use non atomic operations for minix_*_bit() and ext2_*_bit()\0" - "Date\0Wed, 25 Jan 2006 11:30:33 +0000\0" + "Date\0Wed, 25 Jan 2006 20:30:33 +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" "Bitmap functions for the minix filesystem and the ext2 filesystem do not\n" @@ -51,7 +51,8 @@ " 10 files changed, 40 insertions(+), 52 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-h8300/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-h8300/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-h8300/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-h8300/bitops.h\t2006-01-25 19:14:01.000000000 +0900\n" "@@ -397,9 +397,9 @@\n" " }\n" @@ -67,7 +68,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-ia64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-ia64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-ia64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-ia64/bitops.h\t2006-01-25 19:14:02.000000000 +0900\n" "@@ -394,18 +394,18 @@\n" " \n" @@ -94,7 +96,8 @@ " #define minix_find_first_zero_bit(addr,size)\tfind_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-mips/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-mips/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-mips/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-mips/bitops.h\t2006-01-25 19:14:05.000000000 +0900\n" "@@ -956,9 +956,9 @@\n" " * FIXME: These assume that Minix uses the native byte/bitorder.\n" @@ -110,7 +113,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-s390/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-s390/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-s390/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-s390/bitops.h\t2006-01-25 19:14:05.000000000 +0900\n" "@@ -871,11 +871,11 @@\n" " */\n" @@ -142,7 +146,8 @@ " \ttest_bit(nr,(unsigned long *)addr)\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sh/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sh/bitops.h\t2006-01-25 19:14:06.000000000 +0900\n" "@@ -339,8 +339,8 @@\n" " }\n" @@ -200,7 +205,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sh64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sh64/bitops.h\t2006-01-25 19:14:07.000000000 +0900\n" "@@ -382,8 +382,8 @@\n" " #define hweight8(x) generic_hweight8(x)\n" @@ -258,7 +264,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sparc/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sparc/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -523,11 +523,11 @@\n" " \n" @@ -276,7 +283,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sparc64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sparc64/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -280,11 +280,11 @@\n" " \n" @@ -294,7 +302,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-v850/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-v850/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-v850/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-v850/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -336,18 +336,18 @@\n" " #define hweight16(x) \t\t\tgeneric_hweight16 (x)\n" @@ -321,7 +330,8 @@ " #define minix_find_first_zero_bit \tfind_first_zero_bit\n" " \n" "Index: 2.6-git/include/asm-xtensa/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-xtensa/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-xtensa/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -436,9 +436,9 @@\n" " \n" @@ -336,4 +346,4 @@ " #define minix_test_bit(nr,addr) test_bit(nr,addr)\n" #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) -4cd22286776dafe4758c16225ba690b0a6ff83b11598b4ccf591742e2018b0fa +7bcc5fe40dfe7bff1507b1051603912f76faeafb5902dd49b8b5a4eef8973ce9
diff --git a/a/content_digest b/N3/content_digest index 61bbe3f..9b875ee 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 @@ -336,4 +336,4 @@ " #define minix_test_bit(nr,addr) test_bit(nr,addr)\n" #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) -4cd22286776dafe4758c16225ba690b0a6ff83b11598b4ccf591742e2018b0fa +81e727a0e2a531939b1d91387786fc3eb114179347260183398598c6a33c7ba4
diff --git a/a/1.txt b/N4/1.txt index 1375de8..d56507f 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -21,7 +21,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 10 files changed, 40 insertions(+), 52 deletions(-) Index: 2.6-git/include/asm-h8300/bitops.h -=================================--- 2.6-git.orig/include/asm-h8300/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-h8300/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-h8300/bitops.h 2006-01-25 19:14:01.000000000 +0900 @@ -397,9 +397,9 @@ } @@ -37,7 +38,8 @@ Index: 2.6-git/include/asm-h8300/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-ia64/bitops.h -=================================--- 2.6-git.orig/include/asm-ia64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-ia64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-ia64/bitops.h 2006-01-25 19:14:02.000000000 +0900 @@ -394,18 +394,18 @@ @@ -64,7 +66,8 @@ Index: 2.6-git/include/asm-ia64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-mips/bitops.h -=================================--- 2.6-git.orig/include/asm-mips/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-mips/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-mips/bitops.h 2006-01-25 19:14:05.000000000 +0900 @@ -956,9 +956,9 @@ * FIXME: These assume that Minix uses the native byte/bitorder. @@ -80,7 +83,8 @@ Index: 2.6-git/include/asm-mips/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-s390/bitops.h -=================================--- 2.6-git.orig/include/asm-s390/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-s390/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-s390/bitops.h 2006-01-25 19:14:05.000000000 +0900 @@ -871,11 +871,11 @@ */ @@ -112,7 +116,8 @@ Index: 2.6-git/include/asm-s390/bitops.h test_bit(nr,(unsigned long *)addr) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sh/bitops.h -=================================--- 2.6-git.orig/include/asm-sh/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sh/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sh/bitops.h 2006-01-25 19:14:06.000000000 +0900 @@ -339,8 +339,8 @@ } @@ -170,7 +175,8 @@ Index: 2.6-git/include/asm-sh/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sh64/bitops.h -=================================--- 2.6-git.orig/include/asm-sh64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sh64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sh64/bitops.h 2006-01-25 19:14:07.000000000 +0900 @@ -382,8 +382,8 @@ #define hweight8(x) generic_hweight8(x) @@ -228,7 +234,8 @@ Index: 2.6-git/include/asm-sh64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sparc/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sparc/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sparc/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -523,11 +523,11 @@ @@ -246,7 +253,8 @@ Index: 2.6-git/include/asm-sparc/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sparc64/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-sparc64/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-sparc64/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -280,11 +280,11 @@ @@ -264,7 +272,8 @@ Index: 2.6-git/include/asm-sparc64/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-v850/bitops.h -=================================--- 2.6-git.orig/include/asm-v850/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-v850/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-v850/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -336,18 +336,18 @@ #define hweight16(x) generic_hweight16 (x) @@ -291,7 +300,8 @@ Index: 2.6-git/include/asm-v850/bitops.h #define minix_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-xtensa/bitops.h -=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h 2006-01-25 19:07:14.000000000 +0900 +=================================================================== +--- 2.6-git.orig/include/asm-xtensa/bitops.h 2006-01-25 19:07:14.000000000 +0900 +++ 2.6-git/include/asm-xtensa/bitops.h 2006-01-25 19:14:08.000000000 +0900 @@ -436,9 +436,9 @@ diff --git a/a/content_digest b/N4/content_digest index 61bbe3f..82415de 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 2/6] use non atomic operations for minix_*_bit() and ext2_*_bit()\0" - "Date\0Wed, 25 Jan 2006 11:30:33 +0000\0" + "Date\0Wed, 25 Jan 2006 20:30:33 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Richard Henderson <rth@twiddle.net>" Ivan Kokshaysky <ink@jurassic.park.msu.ru> @@ -51,7 +51,8 @@ " 10 files changed, 40 insertions(+), 52 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-h8300/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-h8300/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-h8300/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-h8300/bitops.h\t2006-01-25 19:14:01.000000000 +0900\n" "@@ -397,9 +397,9 @@\n" " }\n" @@ -67,7 +68,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-ia64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-ia64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-ia64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-ia64/bitops.h\t2006-01-25 19:14:02.000000000 +0900\n" "@@ -394,18 +394,18 @@\n" " \n" @@ -94,7 +96,8 @@ " #define minix_find_first_zero_bit(addr,size)\tfind_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-mips/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-mips/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-mips/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-mips/bitops.h\t2006-01-25 19:14:05.000000000 +0900\n" "@@ -956,9 +956,9 @@\n" " * FIXME: These assume that Minix uses the native byte/bitorder.\n" @@ -110,7 +113,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-s390/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-s390/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-s390/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-s390/bitops.h\t2006-01-25 19:14:05.000000000 +0900\n" "@@ -871,11 +871,11 @@\n" " */\n" @@ -142,7 +146,8 @@ " \ttest_bit(nr,(unsigned long *)addr)\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sh/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sh/bitops.h\t2006-01-25 19:14:06.000000000 +0900\n" "@@ -339,8 +339,8 @@\n" " }\n" @@ -200,7 +205,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sh64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sh64/bitops.h\t2006-01-25 19:14:07.000000000 +0900\n" "@@ -382,8 +382,8 @@\n" " #define hweight8(x) generic_hweight8(x)\n" @@ -258,7 +264,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sparc/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sparc/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -523,11 +523,11 @@\n" " \n" @@ -276,7 +283,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sparc64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc64/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-sparc64/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -280,11 +280,11 @@\n" " \n" @@ -294,7 +302,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-v850/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-v850/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-v850/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-v850/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -336,18 +336,18 @@\n" " #define hweight16(x) \t\t\tgeneric_hweight16 (x)\n" @@ -321,7 +330,8 @@ " #define minix_find_first_zero_bit \tfind_first_zero_bit\n" " \n" "Index: 2.6-git/include/asm-xtensa/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-xtensa/bitops.h\t2006-01-25 19:07:14.000000000 +0900\n" "+++ 2.6-git/include/asm-xtensa/bitops.h\t2006-01-25 19:14:08.000000000 +0900\n" "@@ -436,9 +436,9 @@\n" " \n" @@ -336,4 +346,4 @@ " #define minix_test_bit(nr,addr) test_bit(nr,addr)\n" #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) -4cd22286776dafe4758c16225ba690b0a6ff83b11598b4ccf591742e2018b0fa +95888f66db3727dbed543cfa7b612e8024791fbd62d63c4802c448ffc9c8c48b
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.