From: Ingo Molnar <mingo@elte•hu>
To: Chris Mason <chris.mason@oracle•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Thomas Gleixner <tglx@linutronix•de>,
"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: Mon, 9 Feb 2009 09:51:28 +0100 [thread overview]
Message-ID: <20090209085128.GA31890@elte.hu> (raw)
In-Reply-To: <1234140383.26563.0.camel@think.oraclecorp.com>
* Chris Mason <chris.mason@oracle•com> wrote:
> 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.
It was obvious how to resolve it so i did not notify you about it. I generally ping
people when a conflict looks troublesome in some way - that's pretty rare.
Ingo
next prev parent reply other threads:[~2009-02-09 8:51 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
2009-02-09 8:51 ` Ingo Molnar [this message]
-- 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=20090209085128.GA31890@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=chris.mason@oracle$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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