From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Jan Kara <jack@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Joseph Qi <joseph.qi@huawei.com>
Subject: linux-next: manual merge of the akpm-current tree with the ext3 tree
Date: Tue, 11 Nov 2014 17:55:53 +1100 [thread overview]
Message-ID: <20141111175553.795e7828@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/ocfs2/inode.h between commit 1c92ec678f32 ("ocfs2: Convert to
private i_dquot field") from the ext3 tree and commit eeb85794b87e
("ocfs2: fix leftover orphan entry caused by append O_DIRECT write
crash") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ocfs2/inode.h
index ca3431ee7f24,1fdf4707e6d3..000000000000
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@@ -81,7 -81,7 +81,9 @@@ struct ocfs2_inode_inf
tid_t i_sync_tid;
tid_t i_datasync_tid;
+ struct dquot *i_dquot[MAXQUOTAS];
++
+ wait_queue_head_t append_dio_wq;
};
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-11 6:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 6:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-02-27 3:11 linux-next: manual merge of the akpm-current tree with the ext3 tree Stephen Rothwell
2018-02-27 9:36 ` Jan Kara
2014-02-26 7:32 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=20141111175553.795e7828@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=joseph.qi@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).