linux-next: manual merge of the moduleh tree with the vfs tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
include/linux/reiserfs_fs.h between commit e9876523cf40 ("move private
bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h") from the vfs tree and
commit 187f1882b5b0 ("BUG: headers with BUG/BUG_ON etc. need
linux/bug.h") from the moduleh tree.

The former commit gutted this file so that the latter patch is no longer
needed.   I also added the following patch as a merge fix.

Al: this could be added to your tree.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 19 Mar 2012 16:43:56 +1100
Subject: [PATCH] reiserfs: reiserfs.h uses BUG so should include bug.h

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 fs/reiserfs/reiserfs.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 445d768..a59d271 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -7,6 +7,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/bug.h>
 #include <linux/workqueue.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature