From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Jan 2011 22:45:52 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7c955fca3e1d8132982148267d9efcafae849bb6;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-udf-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  UDF: Close small mem leak in udf_find_entry()
  udf: Fix directory corruption after extent merging
  udf: Protect udf_file_aio_write from possible races
  udf: Remove unnecessary bkl usages
  udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
  udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
  udf: Remove BKL from free space counting functions
  udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
  udf: Remove BKL from udf_put_super() and udf_remount_fs()
  udf: Protect default inode credentials by rwlock
  udf: Protect all modifications of LVID with s_alloc_mutex
  udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
  udf: Remove BKL from udf_update_inode
  udf: Convert UDF_SB(sb)->s_flags to use bitops
  fs/udf: Add printf format/argument verification
  fs/udf: Use vzalloc

(Evil merge: this also removes the BKL dependency from the Kconfig file)
---

7c955fca3e1d8132982148267d9efcafae849bb6
diff --cc fs/udf/Kconfig
index f8def3c8ea4c,f8def3c8ea4c..0e0e99bd6bce
--- a/fs/udf/Kconfig
+++ b/fs/udf/Kconfig
@@@ -1,6 -1,6 +1,5 @@@
  config UDF_FS
  	tristate "UDF file system support"
--	depends on BKL # needs serious work to remove
  	select CRC_ITU_T
  	help
  	  This is the new file system used on some CD-ROMs and DVDs. Say Y if