From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Chinner <david@fromorbit.com>, xfs-masters@oss.sgi.com
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Eric Sandeen <sandeen@sandeen.net>,
Felix Blyakher <felixb@sgi.com>,
Christoph Hellwig <hch@infradead.org>
Subject: linux-next: manual merge of the xfs tree with Linus' tree
Date: Tue, 18 Aug 2009 10:12:15 +1000 [thread overview]
Message-ID: <20090818101215.aba4d0bf.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the xfs tree got a conflict in
fs/xfs/linux-2.6/xfs_sync.h between commit
bc990f5cb424cdca9dda866785d088e2c2110ecc ("xfs: fix locking in
xfs_iget_cache_hit") from Linus' tree and commit
370f048214b4e9aa2102fa3c454ae1374da287c5 ("xfs: add more statics & drop
some unused functions") from the xfs tree.
Just context changes (add/remove). I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/xfs/linux-2.6/xfs_sync.h
index 5912060,23e7e7e..0000000
--- a/fs/xfs/linux-2.6/xfs_sync.h
+++ b/fs/xfs/linux-2.6/xfs_sync.h
@@@ -48,8 -48,6 +48,7 @@@ int xfs_reclaim_inode(struct xfs_inode
int xfs_reclaim_inodes(struct xfs_mount *mp, int mode);
void xfs_inode_set_reclaim_tag(struct xfs_inode *ip);
+void __xfs_inode_set_reclaim_tag(struct xfs_perag *pag, struct xfs_inode *ip);
- void xfs_inode_clear_reclaim_tag(struct xfs_inode *ip);
void __xfs_inode_clear_reclaim_tag(struct xfs_mount *mp, struct xfs_perag *pag,
struct xfs_inode *ip);
next reply other threads:[~2009-08-18 0:12 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-18 0:12 Stephen Rothwell [this message]
2009-08-18 6:49 ` linux-next: manual merge of the xfs tree with Linus' tree Felix Blyakher
2009-08-18 7:17 ` Stephen Rothwell
2011-03-28 1:21 Stephen Rothwell
2011-09-15 2:30 Stephen Rothwell
2011-09-15 11:05 ` Christoph Hellwig
2012-01-03 1:06 Stephen Rothwell
2012-01-03 1:34 ` Dave Chinner
2015-04-20 2:24 Stephen Rothwell
2016-07-21 1:07 Stephen Rothwell
2016-07-21 1:35 ` Dave Chinner
2017-12-21 22:50 Stephen Rothwell
2017-12-21 23:01 ` Darrick J. Wong
2018-06-05 0:34 Stephen Rothwell
2018-06-05 0:38 ` Stephen Rothwell
2018-06-05 0:59 ` Dave Chinner
2018-06-05 1:13 ` Andreas Grünbacher
2018-06-05 1:25 ` Stephen Rothwell
2018-10-31 0:22 Stephen Rothwell
2018-10-31 1:05 ` Dave Chinner
2019-07-16 23:36 Stephen Rothwell
2022-01-17 22:30 Stephen Rothwell
2022-01-18 18:17 ` Darrick J. Wong
2022-03-30 22:00 Stephen Rothwell
2023-10-31 0:41 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=20090818101215.aba4d0bf.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=david@fromorbit.com \
--cc=felixb@sgi.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sandeen@sandeen.net \
--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).