diff for duplicates of <3DD939B5.3D1F2B6E@paradyne.com> diff --git a/a/1.txt b/N1/1.txt index a95a5e3..cfaaa2c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,33 +5,17 @@ thanks mds Tom Rini wrote: -> +> > On Sun, Nov 17, 2002 at 10:44:40PM +0100, Joakim Tjernlund wrote: -> +> > > > Tom + Joakim, > > > we're doing a release soon over here at sensors/i2c, > > > do you want this checked in as-is, with mods, or not at all? > > > > As-is for me. No problems reported to me. -> +> > Works for me then. -> +> > -- > Tom Rini (TR1265) > http://gate.crashing.org/~trini/ --------------- next part -------------- -patching file i2c-algo-8xx.c -Hunk #1 FAILED at 7. -Hunk #2 FAILED at 27. -Hunk #3 succeeded at 74 with fuzz 2 (offset 14 lines). -Hunk #5 succeeded at 157 (offset 18 lines). -Hunk #6 FAILED at 177. -Hunk #8 succeeded at 220 (offset 18 lines). -Hunk #9 FAILED at 237. -Hunk #10 succeeded at 333 (offset 2 lines). -Hunk #11 FAILED at 343. -Hunk #12 FAILED at 359. -Hunk #13 succeeded at 439 (offset 18 lines). -Hunk #14 FAILED at 464. -Hunk #15 succeeded at 514 (offset 2 lines). -7 out of 15 hunks FAILED -- saving rejects to file i2c-algo-8xx.c.rej diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..6377bb9 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/plain; charset=us-ascii; + name="fail" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename="fail" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..36a3317 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,15 @@ +patching file i2c-algo-8xx.c +Hunk #1 FAILED at 7. +Hunk #2 FAILED at 27. +Hunk #3 succeeded at 74 with fuzz 2 (offset 14 lines). +Hunk #5 succeeded at 157 (offset 18 lines). +Hunk #6 FAILED at 177. +Hunk #8 succeeded at 220 (offset 18 lines). +Hunk #9 FAILED at 237. +Hunk #10 succeeded at 333 (offset 2 lines). +Hunk #11 FAILED at 343. +Hunk #12 FAILED at 359. +Hunk #13 succeeded at 439 (offset 18 lines). +Hunk #14 FAILED at 464. +Hunk #15 succeeded at 514 (offset 2 lines). +7 out of 15 hunks FAILED -- saving rejects to file i2c-algo-8xx.c.rej diff --git a/a/content_digest b/N1/content_digest index 4f5064f..be08dfb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,14 @@ "ref\03DD8014B.D88A6C34@paradyne.com\0" "ref\0001101c28e82$88d2bc40$0200a8c0@telia.com\0" "ref\020021118141042.GA15279@opus.bloom.county\0" - "From\0mds@paradyne.com (Mark D. Studebaker)\0" - "Subject\08xx i2c refers to unspecified chip errata\0" - "Date\0Thu, 19 May 2005 06:23:41 +0000\0" + "From\0Mark D. Studebaker <mds@paradyne.com>\0" + "Subject\0Re: 8xx i2c refers to unspecified chip errata\0" + "Date\0Mon, 18 Nov 2002 14:04:21 -0500\0" "To\0Joakim Tjernlund <Joakim.Tjernlund@lumentis.se>\0" "Cc\0Tom Rini <trini@kernel.crashing.org>" linuxppc-embedded@lists.linuxppc.org " sensors@stimpy.netroedge.com\0" - "\00:1\0" + "\01:1\0" "b\0" "whatever your patch was against didn't match our tree very well. would\n" "you please\n" @@ -18,21 +18,23 @@ "mds\n" "\n" "Tom Rini wrote:\n" - "> \n" + ">\n" "> On Sun, Nov 17, 2002 at 10:44:40PM +0100, Joakim Tjernlund wrote:\n" - "> \n" + ">\n" "> > > Tom + Joakim,\n" "> > > we're doing a release soon over here at sensors/i2c,\n" "> > > do you want this checked in as-is, with mods, or not at all?\n" "> >\n" "> > As-is for me. No problems reported to me.\n" - "> \n" + ">\n" "> Works for me then.\n" - "> \n" + ">\n" "> --\n" "> Tom Rini (TR1265)\n" - "> http://gate.crashing.org/~trini/\n" - "-------------- next part --------------\n" + > http://gate.crashing.org/~trini/ + "\01:2\0" + "fn\0fail\0" + "b\0" "patching file i2c-algo-8xx.c\n" "Hunk #1 FAILED at 7.\n" "Hunk #2 FAILED at 27.\n" @@ -49,4 +51,4 @@ "Hunk #15 succeeded at 514 (offset 2 lines).\n" 7 out of 15 hunks FAILED -- saving rejects to file i2c-algo-8xx.c.rej -58852601f1c0c2d43ca8bc80ac828378534495900ef65db3471ec9f6d87cd652 +e669f609e9c2a8318ae14acdede25f7521bd6ecf1955ffd60bb14d9645e86987
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.