mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Arnd Bergmann <arnd@arndb.de>
Subject: linux-next: manual merge of the cleancache tree with the bkl-config tree
Date: Wed, 17 Nov 2010 13:33:43 +1100	[thread overview]
Message-ID: <20101117133343.3d75d053.sfr@canb.auug.org.au> (raw)

Hi Dan,

Today's linux-next merge of the cleancache tree got a conflict in
fs/ocfs2/super.c between commit cdbe83a95ae7c7a8762c10567a2c5d08cfc1cc4d
("BKL: remove extraneous #include <smp_lock.h>") from the bkl-config tree
and commit 91bf812da0c4f2efd0883fe02dc057853de731b1 ("ocfs2: add
cleancache support") from the cleancache tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/ocfs2/super.c
index cfeab7c,e3f0a4e..0000000
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@@ -41,6 -41,8 +41,7 @@@
  #include <linux/mount.h>
  #include <linux/seq_file.h>
  #include <linux/quotaops.h>
 -#include <linux/smp_lock.h>
+ #include <linux/cleancache.h>
  
  #define MLOG_MASK_PREFIX ML_SUPER
  #include <cluster/masklog.h>

                 reply	other threads:[~2010-11-17  2:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20101117133343.3d75d053.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=dan.magenheimer@oracle.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

all inboxes | Powered by JetHome®