diff for duplicates of <201006141208.37222.philipp.reisner@linbit.com> diff --git a/a/1.txt b/N1/1.txt index c9675bc..732afa7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ Am Montag, 14. Juni 2010, um 11:45:00 schrieb Jens Axboe: > >> On 2010-06-14 03:26, Stephen Rothwell wrote: > >>> Hi Jens, Philipp, > >>> -> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org> wrote: +> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe@kernel.dk> wrote: > >>>> I'm starting to think that it would be a little easier if you did not > >>>> pull the drbd tree, I really should be pulling that into my -next > >>>> branch instead. diff --git a/a/content_digest b/N1/content_digest index abfb91e..c2eaa7f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\020100610135203.4649453a.sfr@canb.auug.org.au\0" "ref\0201006141143.42783.philipp.reisner@linbit.com\0" "ref\04C15FA1C.1080901@kernel.dk\0" - "ref\04C15FA1C.1080901-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org\0" - "From\0Philipp Reisner <philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: linux-next: manual merge of the drbd tree with the block trees\0" + "From\0Philipp Reisner <philipp.reisner@linbit.com>\0" + "Subject\0Re: [Drbd-dev] linux-next: manual merge of the drbd tree with the block trees\0" "Date\0Mon, 14 Jun 2010 12:08:33 +0200\0" - "To\0Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>\0" - "Cc\0Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>" - linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org\0" + "To\0Jens Axboe <axboe@kernel.dk>\0" + "Cc\0Stephen Rothwell <sfr@canb.auug.org.au>" + linux-next@vger.kernel.org + linux-kernel@vger.kernel.org + " drbd-dev@lists.linbit.com\0" "\00:1\0" "b\0" "Am Montag, 14. Juni 2010, um 11:45:00 schrieb Jens Axboe:\n" @@ -18,7 +17,7 @@ "> >> On 2010-06-14 03:26, Stephen Rothwell wrote:\n" "> >>> Hi Jens, Philipp,\n" "> >>> \n" - "> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org> wrote:\n" + "> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe@kernel.dk> wrote:\n" "> >>>> I'm starting to think that it would be a little easier if you did not\n" "> >>>> pull the drbd tree, I really should be pulling that into my -next\n" "> >>>> branch instead.\n" @@ -72,4 +71,4 @@ "\n" DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria. -4d3e5d80d63750083f5ca016f750ea9c3f737a13ca6d049649952796ad004aa7 +18dbd693812f52d5a2494b950ecc0ade14944d0a7b913245fa17ad4dbb7ae331
diff --git a/a/1.txt b/N2/1.txt index c9675bc..732afa7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,7 +4,7 @@ Am Montag, 14. Juni 2010, um 11:45:00 schrieb Jens Axboe: > >> On 2010-06-14 03:26, Stephen Rothwell wrote: > >>> Hi Jens, Philipp, > >>> -> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org> wrote: +> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe@kernel.dk> wrote: > >>>> I'm starting to think that it would be a little easier if you did not > >>>> pull the drbd tree, I really should be pulling that into my -next > >>>> branch instead. diff --git a/a/content_digest b/N2/content_digest index abfb91e..2174981 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,14 @@ "ref\020100610135203.4649453a.sfr@canb.auug.org.au\0" "ref\0201006141143.42783.philipp.reisner@linbit.com\0" "ref\04C15FA1C.1080901@kernel.dk\0" - "ref\04C15FA1C.1080901-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org\0" - "From\0Philipp Reisner <philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>\0" + "From\0Philipp Reisner <philipp.reisner@linbit.com>\0" "Subject\0Re: linux-next: manual merge of the drbd tree with the block trees\0" "Date\0Mon, 14 Jun 2010 12:08:33 +0200\0" - "To\0Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>\0" - "Cc\0Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>" - linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org\0" + "To\0Jens Axboe <axboe@kernel.dk>\0" + "Cc\0Stephen Rothwell <sfr@canb.auug.org.au>" + drbd-dev@lists.linbit.com + linux-next@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Am Montag, 14. Juni 2010, um 11:45:00 schrieb Jens Axboe:\n" @@ -18,7 +17,7 @@ "> >> On 2010-06-14 03:26, Stephen Rothwell wrote:\n" "> >>> Hi Jens, Philipp,\n" "> >>> \n" - "> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org> wrote:\n" + "> >>> On Thu, 10 Jun 2010 08:01:35 +0200 Jens Axboe <axboe@kernel.dk> wrote:\n" "> >>>> I'm starting to think that it would be a little easier if you did not\n" "> >>>> pull the drbd tree, I really should be pulling that into my -next\n" "> >>>> branch instead.\n" @@ -72,4 +71,4 @@ "\n" DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria. -4d3e5d80d63750083f5ca016f750ea9c3f737a13ca6d049649952796ad004aa7 +fa7c2ffff68396de47d0ca339f218da3accb370226a29770106887a7199b2d14
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.