From: Jens Axboe <jaxboe@fusionio.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Philipp Reisner <philipp.reisner@linbit.com>,
drbd-dev@linbit.com, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Julia Lawall <julia@diku.dk>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the drbd tree with Linus' tree
Date: Tue, 1 Jun 2010 10:22:47 +0200 [thread overview]
Message-ID: <20100601082246.GA3564@kernel.dk> (raw)
In-Reply-To: <20100601081823.GA29991@infradead.org>
On Tue, Jun 01 2010, Christoph Hellwig wrote:
> On Tue, Jun 01, 2010 at 02:13:24PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drbd tree got a conflict in fs/pipe.c
> > between commit cc967be54710d97c05229b2e5ba2d00df84ddd64 ("fs: Add missing
> > mutex_unlock") from Linus' tree and commits
> > 0191f8697bbdfefcd36e7b8dc3eeddfe82893e4b ("pipe: F_SETPIPE_SZ should
> > return -EPERM for non-root") and b9598db3401282bb27b4aef77e3eee12015f7f29
> > ("pipe: make F_{GET,SET}PIPE_SZ deal with byte sizes") from the drbd tree.
> >
> > I fixed it up (see below) and can carry the fix for a while.
>
> Why is the drbd tree touching fs/pipe.c anyway?
A quick guess would be that it's based off for-linus in the block tree,
which has a patch or two in that area. Why it would conflict and simply
not note that it's the same change, perhaps a rebase or something? Not
sure.
--
Jens Axboe
next prev parent reply other threads:[~2010-06-01 8:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 4:13 linux-next: manual merge of the drbd tree with Linus' tree Stephen Rothwell
2010-06-01 8:18 ` Christoph Hellwig
[not found] ` <20100601081823.GA29991-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2010-06-01 8:22 ` Stephen Rothwell
2010-06-01 8:31 ` Jens Axboe
2010-06-01 8:42 ` Stephen Rothwell
2010-06-01 8:53 ` Jens Axboe
2010-06-01 10:35 ` Stephen Rothwell
2010-06-01 10:45 ` Jens Axboe
2010-06-01 10:49 ` Stephen Rothwell
2010-06-01 10:50 ` Jens Axboe
2010-06-01 8:22 ` Jens Axboe [this message]
[not found] ` <20100601082246.GA3564-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
2010-06-01 8:32 ` Christoph Hellwig
2010-06-01 8:36 ` Jens Axboe
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=20100601082246.GA3564@kernel.dk \
--to=jaxboe@fusionio.com \
--cc=drbd-dev@linbit.com \
--cc=hch@infradead.org \
--cc=julia@diku.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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).