Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs changes from Artem Bityutskiy:
 "No big changes for 3.7 in UBIFS:
   - Error reporting and debug printing improvements
   - Power cut emulation fixes
   - Minor cleanups"

Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
changes.

* tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: print less
  UBIFS: use pr_ helper instead of printk
  UBIFS: comply with coding style
  UBIFS: use __aligned() attribute
  UBIFS: remove __DATE__ and __TIME__
  UBIFS: fix power cut emulation for mtdram
  UBIFS: improve scanning debug output
  UBIFS: always print full error reports
  UBIFS: print PID in debug messages

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index 8eda717cb99b..ff8229340cd5 100644
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -293,8 +293,8 @@ int ubifs_bg_thread(void *info)
         int err;
         struct ubifs_info *c = info;
 
-        dbg_msg("background thread \"%s\" started, PID %d",
-                c->bgt_name, current->pid);
+        ubifs_msg("background thread \"%s\" started, PID %d",
+                  c->bgt_name, current->pid);
         set_freezable();
 
         while (1) {
@@ -328,7 +328,7 @@ int ubifs_bg_thread(void *info)
                 cond_resched();
         }
 
-        dbg_msg("background thread \"%s\" stops", c->bgt_name);
+        ubifs_msg("background thread \"%s\" stops", c->bgt_name);
         return 0;
 }
 
@@ -514,7 +514,7 @@ struct idx_node {
         struct list_head list;
         int iip;
         union ubifs_key upper_key;
-        struct ubifs_idx_node idx __attribute__((aligned(8)));
+        struct ubifs_idx_node idx __aligned(8);
 };
 
 /**