From: Chris Mason <chris.mason@oracle.com>
To: Mitch Harder <mitch.harder@sabayonlinux.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>,
Dan Merillat <dan.merillat@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
BTRFS Mailing list <linux-btrfs@vger.kernel.org>
Subject: Re: processes stuck in llseek
Date: Thu, 18 Aug 2011 13:52:51 -0400 [thread overview]
Message-ID: <1313689626-sup-7057@shiny> (raw)
In-Reply-To: <CAKcLGm8rY+3TYpe=ivmNrsZgUcBcgk3-6RRe81vGComN2bqgMw@mail.gmail.com>
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:
> > 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:
> >> > 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:
> >> >>
> >> >>> 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.
> >> >
> >> > 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
> >> 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
> > 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
next prev parent reply other threads:[~2011-08-18 17:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-16 3:59 processes stuck in llseek Dan Merillat
2011-08-16 12:36 ` David Sterba
2011-08-16 12:51 ` Chris Mason
2011-08-16 19:22 ` Dan Merillat
2011-08-17 1:23 ` Li Zefan
2011-08-18 15:40 ` Mitch Harder
2011-08-18 16:00 ` Chris Mason
2011-08-18 16:53 ` Mitch Harder
2011-08-18 17:52 ` Chris Mason [this message]
2011-08-19 16:20 ` Dan Merillat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313689626-sup-7057@shiny \
--to=chris.mason@oracle.com \
--cc=dan.merillat@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mitch.harder@sabayonlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).