From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Whitehouse <swhiteho@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Al Viro <viro@zeniv.linux.org.uk>
Subject: linux-next: manual merge of the gfs2 tree with the vfs tree
Date: Wed, 27 Jan 2010 11:17:08 +1100 [thread overview]
Message-ID: <20100127111708.ed39215c.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 833 bytes --]
Hi Steven,
Today's linux-next merge of the gfs2 tree got a conflict in
fs/gfs2/super.c between commit 716c28c0bc8bcbdd26e819f38dfc8fdfaafc0289
("pass writeback_control to ->write_inode") from the vfs tree and commit
56c79d55103b5d0943e063d036e7ebf8a7a1c21b ("GFS2: Wait for unlock
completion on umount") from the gfs2 tree.
Just simple overlapping additions. I fixed up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/gfs2/super.c
index effa35a,e2bf19f..0000000
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@@ -21,7 -21,7 +21,8 @@@
#include <linux/gfs2_ondisk.h>
#include <linux/crc32.h>
#include <linux/time.h>
+#include <linux/writeback.h>
+ #include <linux/wait.h>
#include "gfs2.h"
#include "incore.h"
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-01-27 0:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-27 0:17 Stephen Rothwell [this message]
2019-07-08 3:48 linux-next: manual merge of the gfs2 tree with the vfs tree Stephen Rothwell
2019-07-12 0:56 ` Stephen Rothwell
2021-06-09 2:13 Stephen Rothwell
2021-06-11 1:12 Stephen Rothwell
2021-06-11 1:46 ` Al Viro
2021-06-11 14:45 ` Andreas Gruenbacher
2021-06-22 1:38 ` Stephen Rothwell
2021-06-22 6:48 ` Andreas Gruenbacher
2021-06-22 21:56 ` 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=20100127111708.ed39215c.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=swhiteho@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.