diff for duplicates of <1313689626-sup-7057@shiny> diff --git a/a/1.txt b/N1/1.txt index ebcd4f8..e6cb82f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,39 +1,31 @@ Excerpts from Mitch Harder's message of 2011-08-18 12:53:33 -0400: -> On Thu, Aug 18, 2011 at 11:00 AM, Chris Mason <chris.mason@oracle.com= -> wrote: +> On Thu, Aug 18, 2011 at 11:00 AM, Chris Mason <chris.mason@oracle.com> wrote: > > Excerpts from Mitch Harder's message of 2011-08-18 11:40:17 -0400: -> >> On Tue, Aug 16, 2011 at 8:23 PM, Li Zefan <lizf@cn.fujitsu.com> wr= -ote: +> >> On Tue, Aug 16, 2011 at 8:23 PM, Li Zefan <lizf@cn.fujitsu.com> wrote: > >> > Dan Merillat wrote: -> >> >> On Tue, Aug 16, 2011 at 8:51 AM, Chris Mason <chris.mason@oracl= -e.com> wrote: -> >> >>> Excerpts from Dan Merillat's message of 2011-08-15 23:59:50 -0= -400: +> >> >> On Tue, Aug 16, 2011 at 8:51 AM, Chris Mason <chris.mason@oracle.com> wrote: +> >> >>> Excerpts from Dan Merillat's message of 2011-08-15 23:59:50 -0400: > >> >> -> >> >>> Dan Carpenter sent a patch for this, I'll get it queued up for= - rc3. +> >> >>> Dan Carpenter sent a patch for this, I'll get it queued up for rc3. > >> >> -> >> >> Can you send it? =C2=A0I'd like to test it to see if it fixes m= -y system. +> >> >> Can you send it? I'd like to test it to see if it fixes my system. > >> > > >> > Here it is. > >> > -> >> > http://marc.info/?l=3Dlinux-btrfs&m=3D131176036219732&w=3D2 +> >> > http://marc.info/?l=linux-btrfs&m=131176036219732&w=2 > >> > > >> -> >> Doesn't this patch rely on Josef's SEEK_HOLE/SEEK_DATA patch set w= -hich +> >> Doesn't this patch rely on Josef's SEEK_HOLE/SEEK_DATA patch set which > >> isn't in the kernel yet? > >> -> >> http://marc.info/?l=3Dlinux-btrfs&m=3D130927580606177&w=3D2 +> >> http://marc.info/?l=linux-btrfs&m=130927580606177&w=2 > > -> > It does, but the hang was reported on 3.1-rc1, which does have Jose= -f's +> > It does, but the hang was reported on 3.1-rc1, which does have Josef's > > code. > > ->=20 +> > Thanks. ->=20 +> > That gives me some insights regarding the differences between the > 'for-linus' and the 'for-linus-merged' branches. @@ -46,12 +38,7 @@ since he really likes to resolve conflicts himself. This is mostly because he wants to see what the conflicts are and make sure the integration is done correctly. -But I still provide a for-linus-merged just so we can double check=20 +But I still provide a for-linus-merged just so we can double check the results of the conflict resolution. -chris --- -To unsubscribe from this list: send the line "unsubscribe linux-btrfs" = -in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 518906c..27f551a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -16,41 +16,33 @@ "\00:1\0" "b\0" "Excerpts from Mitch Harder's message of 2011-08-18 12:53:33 -0400:\n" - "> On Thu, Aug 18, 2011 at 11:00 AM, Chris Mason <chris.mason@oracle.com=\n" - "> wrote:\n" + "> On Thu, Aug 18, 2011 at 11:00 AM, Chris Mason <chris.mason@oracle.com> wrote:\n" "> > Excerpts from Mitch Harder's message of 2011-08-18 11:40:17 -0400:\n" - "> >> On Tue, Aug 16, 2011 at 8:23 PM, Li Zefan <lizf@cn.fujitsu.com> wr=\n" - "ote:\n" + "> >> On Tue, Aug 16, 2011 at 8:23 PM, Li Zefan <lizf@cn.fujitsu.com> wrote:\n" "> >> > Dan Merillat wrote:\n" - "> >> >> On Tue, Aug 16, 2011 at 8:51 AM, Chris Mason <chris.mason@oracl=\n" - "e.com> wrote:\n" - "> >> >>> Excerpts from Dan Merillat's message of 2011-08-15 23:59:50 -0=\n" - "400:\n" + "> >> >> On Tue, Aug 16, 2011 at 8:51 AM, Chris Mason <chris.mason@oracle.com> wrote:\n" + "> >> >>> Excerpts from Dan Merillat's message of 2011-08-15 23:59:50 -0400:\n" "> >> >>\n" - "> >> >>> Dan Carpenter sent a patch for this, I'll get it queued up for=\n" - " rc3.\n" + "> >> >>> Dan Carpenter sent a patch for this, I'll get it queued up for rc3.\n" "> >> >>\n" - "> >> >> Can you send it? =C2=A0I'd like to test it to see if it fixes m=\n" - "y system.\n" + "> >> >> Can you send it? \302\240I'd like to test it to see if it fixes my system.\n" "> >> >\n" "> >> > Here it is.\n" "> >> >\n" - "> >> > http://marc.info/?l=3Dlinux-btrfs&m=3D131176036219732&w=3D2\n" + "> >> > http://marc.info/?l=linux-btrfs&m=131176036219732&w=2\n" "> >> >\n" "> >>\n" - "> >> Doesn't this patch rely on Josef's SEEK_HOLE/SEEK_DATA patch set w=\n" - "hich\n" + "> >> Doesn't this patch rely on Josef's SEEK_HOLE/SEEK_DATA patch set which\n" "> >> isn't in the kernel yet?\n" "> >>\n" - "> >> http://marc.info/?l=3Dlinux-btrfs&m=3D130927580606177&w=3D2\n" + "> >> http://marc.info/?l=linux-btrfs&m=130927580606177&w=2\n" "> >\n" - "> > It does, but the hang was reported on 3.1-rc1, which does have Jose=\n" - "f's\n" + "> > It does, but the hang was reported on 3.1-rc1, which does have Josef's\n" "> > code.\n" "> >\n" - ">=20\n" + "> \n" "> Thanks.\n" - ">=20\n" + "> \n" "> That gives me some insights regarding the differences between the\n" "> 'for-linus' and the 'for-linus-merged' branches.\n" "\n" @@ -63,14 +55,9 @@ "because he wants to see what the conflicts are and make sure the\n" "integration is done correctly.\n" "\n" - "But I still provide a for-linus-merged just so we can double check=20\n" + "But I still provide a for-linus-merged just so we can double check \n" "the results of the conflict resolution.\n" "\n" - "-chris\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-btrfs\" =\n" - "in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + -chris -4ea930f384df70ac85d07d28e26befe3adc5f975944e08fe2c55341274c848f6 +fc31efaf1b4c3ba741a742092e21a29bdb383ad45f2ffc9dad1fc82da5409914
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.