From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sage Weil <sage@newdream.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yehuda Sadeh <yehuda@hq.newdream.net>
Subject: linux-next: manual merge of the ceph tree with Linus' tree
Date: Thu, 23 Sep 2010 11:04:52 +1000 [thread overview]
Message-ID: <20100923110452.70c5e572.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
Hi Sage,
Today's linux-next merge of the ceph tree got a conflict in
fs/ceph/pagelist.c between commit
3d4401d9d0aef5c40706350685ddea3df6708496 ("ceph: fix pagelist kunmap
tail") from Linus' tree and commit
49dde0c8bee346a349862c4a3eddcd58e0d0ae90 ("ceph: factor out libceph from
Ceph file system") from the ceph tree.
The latter moved the file to net/ceph/pagelist.c, and the former patch
has been applied there, so I just removed the fs/ceph version of the file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-23 1:04 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-23 1:04 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-05 22:24 linux-next: manual merge of the ceph tree with Linus' tree Stephen Rothwell
2013-07-10 1:24 Stephen Rothwell
2013-07-10 3:57 ` Sage Weil
2013-06-19 1:22 Stephen Rothwell
2013-04-18 1:34 Stephen Rothwell
2012-07-31 1:58 Stephen Rothwell
2012-07-21 23:16 Stephen Rothwell
2012-05-22 1:45 Stephen Rothwell
2012-05-22 3:58 ` Sage Weil
2012-03-21 1:23 Stephen Rothwell
2012-01-11 1:27 Stephen Rothwell
2012-01-11 1:31 ` Al Viro
2012-01-11 1:35 ` Sage Weil
2012-01-11 1:49 ` Al Viro
2012-01-11 3:02 ` Stephen Rothwell
2012-01-11 2:10 ` Alex Elder
2010-12-15 0:14 Stephen Rothwell
2010-09-23 0:56 Stephen Rothwell
2010-09-23 0:29 Stephen Rothwell
2010-09-23 3:36 ` Sage Weil
2010-08-13 0:28 Stephen Rothwell
2010-05-14 0:07 Stephen Rothwell
2010-05-14 0:07 Stephen Rothwell
2010-05-14 0:07 Stephen Rothwell
2010-05-14 4:25 ` Sage Weil
2010-05-14 6:00 ` Stephen Rothwell
2010-01-12 0:09 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=20100923110452.70c5e572.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sage@newdream.net \
--cc=yehuda@hq.newdream.net \
/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).