From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>,
Xen Devel <Xen-devel@lists.xensource.com>,
Christoph Hellwig <hch@lst.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the xen tree with Linus' tree
Date: Mon, 15 Nov 2010 13:04:59 -0800 [thread overview]
Message-ID: <4CE1A07B.5010202@goop.org> (raw)
In-Reply-To: <20101115112352.6cbf5604.sfr@canb.auug.org.au>
On 11/14/2010 04:23 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got a conflict in
> drivers/block/xen-blkfront.c between commit
> 02e031cbc843b010e72fcc05c76113c688b2860f ("block: remove
> REQ_HARDBARRIER") from Linus' tree and commits
> c64e38ea17a81721da0393584fd807f8434050fa ("xen/blkfront: map REQ_FLUSH
> into a full barrier") and be2f8373c188ed1f5d36003c9928e4d695213080
> ("xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER") from the xen
> tree.
>
> I used the xen tree version.
I'll drop that because you should be seeing those changes come via Jens.
J
WARNING: multiple messages have this Message-ID (diff)
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Xen Devel <Xen-devel@lists.xensource.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: manual merge of the xen tree with Linus' tree
Date: Mon, 15 Nov 2010 13:04:59 -0800 [thread overview]
Message-ID: <4CE1A07B.5010202@goop.org> (raw)
In-Reply-To: <20101115112352.6cbf5604.sfr@canb.auug.org.au>
On 11/14/2010 04:23 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got a conflict in
> drivers/block/xen-blkfront.c between commit
> 02e031cbc843b010e72fcc05c76113c688b2860f ("block: remove
> REQ_HARDBARRIER") from Linus' tree and commits
> c64e38ea17a81721da0393584fd807f8434050fa ("xen/blkfront: map REQ_FLUSH
> into a full barrier") and be2f8373c188ed1f5d36003c9928e4d695213080
> ("xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER") from the xen
> tree.
>
> I used the xen tree version.
I'll drop that because you should be seeing those changes come via Jens.
J
next prev parent reply other threads:[~2010-11-15 21:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-15 0:23 linux-next: manual merge of the xen tree with Linus' tree Stephen Rothwell
2010-11-15 21:04 ` Jeremy Fitzhardinge [this message]
2010-11-15 21:04 ` Jeremy Fitzhardinge
2010-11-15 21:07 ` Jens Axboe
2010-11-22 20:15 ` Jeremy Fitzhardinge
2010-11-22 20:17 ` Jens Axboe
2010-11-22 20:21 ` Jeremy Fitzhardinge
-- strict thread matches above, loose matches on Subject: below --
2012-01-11 3:57 Stephen Rothwell
2012-01-11 15:29 ` Ingo Molnar
2012-01-11 21:29 ` Jeremy Fitzhardinge
2012-01-11 21:44 ` Jeremy Fitzhardinge
2012-01-11 22:45 ` Stephen Rothwell
2011-01-15 1:05 linux-next: manual merge of the xen tree with Linus tree Stephen Rothwell
2011-05-17 11:12 ` Stephen Rothwell
2011-05-17 19:15 ` Jeremy Fitzhardinge
2011-05-18 12:32 ` Ian Campbell
2011-05-18 14:33 ` Jeremy Fitzhardinge
2011-05-18 21:35 ` Stephen Rothwell
2010-10-27 1:00 linux-next: manual merge of the xen tree with Linus' tree Stephen Rothwell
2010-07-27 3:32 Stephen Rothwell
2010-07-27 6:08 ` Jeremy Fitzhardinge
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=4CE1A07B.5010202@goop.org \
--to=jeremy@goop.org \
--cc=Xen-devel@lists.xensource.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.