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:

quoted

Excerpts from Mitch Harder's message of 2011-08-18 11:40:17 -0400:

quoted

On Tue, Aug 16, 2011 at 8:23 PM, Li Zefan [off-list ref] wr=

ote:

quoted

quoted

quoted

Dan Merillat wrote:

quoted

On Tue, Aug 16, 2011 at 8:51 AM, Chris Mason <chris.mason@oracl=

e.com> wrote:

quoted

quoted

quoted

quoted

quoted

Excerpts from Dan Merillat's message of 2011-08-15 23:59:50 -0=

400:

quoted

quoted

quoted

quoted

quoted

Dan Carpenter sent a patch for this, I'll get it queued up for=

 rc3.

quoted

quoted

quoted

quoted

Can you send it? =C2=A0I'd like to test it to see if it fixes m=

y system.

quoted

quoted

quoted

Here it is.

http://marc.info/?l=3Dlinux-btrfs&m=3D131176036219732&w=3D2

Doesn't this patch rely on Josef's SEEK_HOLE/SEEK_DATA patch set w=

hich

quoted

quoted

isn't in the kernel yet?

http://marc.info/?l=3Dlinux-btrfs&m=3D130927580606177&w=3D2

It does, but the hang was reported on 3.1-rc1, which does have Jose=

f's

quoted

code.

=20
Thanks.
=20
That gives me some insights regarding the differences between the
'for-linus' and the 'for-linus-merged' branches.

for-linus is usually what I send him to pull, and master is usually the
stable things against the last release (3.0 as of today).

for-linus-merged is used when there is a conflict between his current
tree and my for-linus branch.  Linus almost never uses this directly,
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
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