From: Chris Mason <chris.mason@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the tip-core tree with Linus' tree
Date: Sun, 08 Feb 2009 19:46:23 -0500 [thread overview]
Message-ID: <1234140383.26563.0.camel@think.oraclecorp.com> (raw)
In-Reply-To: <20090209113855.180c03cb.sfr@canb.auug.org.au>
On Mon, 2009-02-09 at 11:38 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip-core tree got a conflict in
> fs/btrfs/locking.c between commit
> b4ce94de9b4d64e8ab3cf155d13653c666e22b9b ("Btrfs: Change btree locking to
> use explicit blocking points") from Linus' tree and commit
> cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 ("Btrfs: stop spinning on
> mutex_trylock and let the adaptive code spin for us") from the tip-core
> tree.
>
> Resolved as in tip/master by taking the version from Linus' tree.
Sorry, I meant to ask Ingo to drop the patch I had sent along for the
btrfs adaptive code. Using Linus' copy was the right answer, it replaces
the patch I sent to Ingo.
-chris
next prev parent reply other threads:[~2009-02-09 0:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-09 0:38 linux-next: manual merge of the tip-core tree with Linus' tree Stephen Rothwell
2009-02-09 0:46 ` Chris Mason [this message]
2009-02-09 8:51 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2009-05-21 1:39 Stephen Rothwell
2009-05-21 3:56 ` Darren Hart
2009-05-21 9:30 ` Thomas Gleixner
2009-05-21 9:38 ` Stephen Rothwell
2009-05-22 0:19 ` Stephen Rothwell
2009-05-22 5:50 ` Stephen Rothwell
2009-05-22 18:18 ` Darren Hart
2009-04-06 0:36 Stephen Rothwell
2009-02-06 2:26 Stephen Rothwell
2009-02-06 13:53 ` Ingo Molnar
2009-02-02 0:46 Stephen Rothwell
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=1234140383.26563.0.camel@think.oraclecorp.com \
--to=chris.mason@oracle.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 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.