diff for duplicates of <1255509739.32489.123.camel@localhost> diff --git a/a/1.txt b/N1/1.txt index 2674d76..032d7c1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ On Sun, 2009-10-11 at 17:19 -0400, H Hartley Sweeten wrote: Ok, I've tried this patch on both mtd-2.6 and linux-2.6 git trees, and it does not apply cleanly. -[dedekind@eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten1 +[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten1 Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver error: patch failed: arch/arm/mach-ep93xx/ts72xx.c:54 error: arch/arm/mach-ep93xx/ts72xx.c: patch does not apply @@ -31,19 +31,19 @@ Patch failed at 0001 RE: [PATCH 1/2] Update ts72xx to use generic platform nand When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -[dedekind@eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch +[dedekind at eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch patching file arch/arm/mach-ep93xx/ts72xx.c Hunk #2 succeeded at 56 with fuzz 1. Ok, I can do things manually: -[dedekind@eru mtd-2.6]$ git update-index arch/arm/mach-ep93xx/ts72xx.c -[dedekind@eru mtd-2.6]$ git am --resolved +[dedekind at eru mtd-2.6]$ git update-index arch/arm/mach-ep93xx/ts72xx.c +[dedekind at eru mtd-2.6]$ git am --resolved Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver But then the second patch does not apply anyway: -[dedekind@eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten2 +[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten2 Applying: RE: [PATCH 2/2] Remove now-defunct ts7250 nand driver error: patch failed: drivers/mtd/nand/ts7250.c:1 error: drivers/mtd/nand/ts7250.c: patch does not apply @@ -51,7 +51,7 @@ Patch failed at 0001 RE: [PATCH 2/2] Remove now-defunct ts7250 nand driver When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -[dedekind@eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch +[dedekind at eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch patching file arch/arm/mach-ep93xx/include/mach/ts72xx.h patching file drivers/mtd/nand/Kconfig patching file drivers/mtd/nand/Makefile @@ -60,7 +60,7 @@ Reversed (or previously applied) patch detected! Assume -R? [n] ^C This is where I'm in the mtd-2.6.git tree, for reference. -[dedekind@eru mtd-2.6]$ git show +[dedekind at eru mtd-2.6]$ git show commit e4af3bf6334341435740fce9ff236ba814686b99 Author: Claudio Scordino <claudio@evidence.eu.com> Date: Wed Oct 7 14:27:07 2009 +0200 @@ -89,4 +89,4 @@ index f8e9975..4f62d20 100644 -- Best Regards, -Artem Bityutskiy (Артём Битюцкий) +Artem Bityutskiy (????? ????????) diff --git a/a/content_digest b/N1/content_digest index 4547cda..bea6cba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\0BD79186B4FD85F4B8E60E381CAEE190901DB7967@mi8nycmail19.Mi8.com\0" "ref\01255260621.16942.38.camel@localhost\0" "ref\0BD79186B4FD85F4B8E60E381CAEE190901DB7E59@mi8nycmail19.Mi8.com\0" - "From\0Artem Bityutskiy <dedekind1@gmail.com>\0" - "Subject\0RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver\0" + "From\0dedekind1@gmail.com (Artem Bityutskiy)\0" + "Subject\0[PATCH 1/2] Update ts72xx to use generic platform nand driver\0" "Date\0Wed, 14 Oct 2009 11:42:19 +0300\0" - "To\0H Hartley Sweeten <hartleys@visionengravers.com>\0" - "Cc\0Matthieu Crapet <mcrapet@gmail.com>" - linux-mtd@lists.infradead.org - David Woodhouse <dwmw2@infradead.org> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sun, 2009-10-11 at 17:19 -0400, H Hartley Sweeten wrote:\n" @@ -36,7 +32,7 @@ "Ok, I've tried this patch on both mtd-2.6 and linux-2.6 git trees, and\n" "it does not apply cleanly.\n" "\n" - "[dedekind@eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten1\n" + "[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten1\n" "Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver\n" "error: patch failed: arch/arm/mach-ep93xx/ts72xx.c:54\n" "error: arch/arm/mach-ep93xx/ts72xx.c: patch does not apply\n" @@ -44,19 +40,19 @@ "When you have resolved this problem run \"git am --resolved\".\n" "If you would prefer to skip this patch, instead run \"git am --skip\".\n" "To restore the original branch and stop patching run \"git am --abort\".\n" - "[dedekind@eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch\n" + "[dedekind at eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch\n" "patching file arch/arm/mach-ep93xx/ts72xx.c\n" "Hunk #2 succeeded at 56 with fuzz 1.\n" "\n" "Ok, I can do things manually:\n" "\n" - "[dedekind@eru mtd-2.6]$ git update-index arch/arm/mach-ep93xx/ts72xx.c\n" - "[dedekind@eru mtd-2.6]$ git am --resolved\n" + "[dedekind at eru mtd-2.6]$ git update-index arch/arm/mach-ep93xx/ts72xx.c\n" + "[dedekind at eru mtd-2.6]$ git am --resolved\n" "Applying: RE: [PATCH 1/2] Update ts72xx to use generic platform nand driver\n" "\n" "But then the second patch does not apply anyway:\n" "\n" - "[dedekind@eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten2\n" + "[dedekind at eru mtd-2.6]$ git am ../l2-mtd-2.6.git/sweeten2\n" "Applying: RE: [PATCH 2/2] Remove now-defunct ts7250 nand driver\n" "error: patch failed: drivers/mtd/nand/ts7250.c:1\n" "error: drivers/mtd/nand/ts7250.c: patch does not apply\n" @@ -64,7 +60,7 @@ "When you have resolved this problem run \"git am --resolved\".\n" "If you would prefer to skip this patch, instead run \"git am --skip\".\n" "To restore the original branch and stop patching run \"git am --abort\".\n" - "[dedekind@eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch\n" + "[dedekind at eru mtd-2.6]$ patch -p1 < .git/rebase-apply/patch\n" "patching file arch/arm/mach-ep93xx/include/mach/ts72xx.h\n" "patching file drivers/mtd/nand/Kconfig\n" "patching file drivers/mtd/nand/Makefile\n" @@ -73,7 +69,7 @@ "\n" "This is where I'm in the mtd-2.6.git tree, for reference.\n" "\n" - "[dedekind@eru mtd-2.6]$ git show\n" + "[dedekind at eru mtd-2.6]$ git show\n" "commit e4af3bf6334341435740fce9ff236ba814686b99\n" "Author: Claudio Scordino <claudio@evidence.eu.com>\n" "Date: Wed Oct 7 14:27:07 2009 +0200\n" @@ -102,6 +98,6 @@ "\n" "-- \n" "Best Regards,\n" - "Artem Bityutskiy (\320\220\321\200\321\202\321\221\320\274 \320\221\320\270\321\202\321\216\321\206\320\272\320\270\320\271)" + Artem Bityutskiy (????? ????????) -d1e9e49d2513ce0ac565acbbda3071d97bc24dc036e65f1e496a763cf07fb6e6 +6f807c8d52fe01e74615460ca877f7fb65b18db2eb42f4e9c4d1f9162009ed16
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.