2012-06-28 15:54:37

by Artem Bityutskiy

[permalink] [raw]
Subject: [GIT PULL] UBI/UBIFS changes for 3.5-rc5

Hi Linus,

The following changes since commit 485802a6c524e62b5924849dd727ddbb1497cc71:

Linux 3.5-rc3 (2012-06-16 17:25:17 -0700)

are available in the git repository at:

git://git.infradead.org/linux-ubifs.git tags/upstream-3.5-rc5

for you to fetch changes up to 903e0e4ef9120c3d7693599acb95e76e8263fb35:

UBI: correct usage of IS_ENABLED() (2012-06-27 14:22:15 +0300)

----------------------------------------------------------------
Fix the debugfs regression - we never enable it because incorrect
'IS_ENABLED()' macro usage: should be 'IS_ENABLED(CONFIG_DEBUG_FS)',
but we had 'IS_ENABLED(DEBUG_FS)'. Also fix incorrect assertion.

----------------------------------------------------------------
Brian Norris (2):
UBIFS: correct usage of IS_ENABLED()
UBI: correct usage of IS_ENABLED()

Dan Carpenter (1):
UBIFS: fix assertion

drivers/mtd/ubi/debug.c | 8 ++++----
fs/ubifs/debug.c | 8 ++++----
fs/ubifs/find.c | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)

--
Best Regards,
Artem Bityutskiy


Attachments:
signature.asc (836.00 B)
This is a digitally signed message part