From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Chinner <david@fromorbit.com>,
xfs-masters@oss.sgi.com, Jens Axboe <jaxboe@fusionio.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [xfs-masters] linux-next: manual merge of the xfs tree with Linus' tree
Date: Mon, 28 Mar 2011 12:47:53 +0200 [thread overview]
Message-ID: <20110328104753.GA27327@lst.de> (raw)
In-Reply-To: <20110328122148.1b48a742.sfr@canb.auug.org.au>
On Mon, Mar 28, 2011 at 12:21:48PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xfs tree got a conflict in
> fs/xfs/linux-2.6/xfs_buf.c between commit 7eaceaccab5f ("block: remove
> per-queue plugging") from Linus' tree and commit 0e6e847ffe37 ("xfs: stop
> using the page cache to back the buffer cache") from the xfs tree.
>
> I assume that these changes (on both sides) were discussed somewhere, but
> maybe not clearly enough?
>
> I have no idea how to fix this, so I tried to just use the xfs tree
> version for today. That failed like this:
>
> fs/xfs/linux-2.6/xfs_buf.c: In function 'xfs_buf_lock':
> fs/xfs/linux-2.6/xfs_buf.c:923: error: implicit declaration of function 'blk_run_backing_dev'
>
> So I used the xfs tree from next-20110325 for today.
What XFS does is to replace blk_run_address_space, which was a wrapper
around blk_run_backing_dev with a direct call to blk_run_backing_dev,
as there change means we don't have the address_space around anymore.
Jens' tree removes both these functions, and introduces blk_flush_plug
as a sort-of replacement. Sticking to the variant from Jens' tree / mainline
with blk_flush_plug is the correct thing here for this case.
Where there more conflicts than just this?
next prev parent reply other threads:[~2011-03-28 10:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 1:21 linux-next: manual merge of the xfs tree with Linus' tree Stephen Rothwell
2011-03-28 10:47 ` Christoph Hellwig [this message]
2011-03-28 10:53 ` [xfs-masters] " Christoph Hellwig
2011-03-28 10:58 ` Jens Axboe
2011-03-28 11:00 ` Christoph Hellwig
2011-03-29 2:57 ` Alex Elder
2011-03-28 13:37 ` Stephen Rothwell
2011-03-28 13:44 ` Christoph Hellwig
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=20110328104753.GA27327@lst.de \
--to=hch@lst.de \
--cc=david@fromorbit.com \
--cc=jaxboe@fusionio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=xfs-masters@oss.sgi.com \
/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).