From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 16:27:40 +0000 (-0700)
Subject: Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v3.4-rc1~118
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e57f146b2837d6a2d04a8ca86cb703f509b00e98;p=~emulex%2Finfiniband.git

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

Pull UBIFS changes from Artem Bityutskiy:
 - Improve error messages
 - Clean-up i_nlink management
 - Minor clean-ups

* tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: improve error messages
  UBIFS: kill CUR_MAX_KEY_LEN macro
  UBIFS: do not use inc_link when i_nlink is zero
  UBIFS: make the dbg_lock spinlock static
  UBIFS: increase dumps loglevel
  UBIFS: amend recovery debugging message
---

e57f146b2837d6a2d04a8ca86cb703f509b00e98