Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux ... Pull kmap_atomic cleanup from Cong Wang. It's been in -next for a long time, and it gets rid of the (no longer used) second argument to k[un]map_atomic(). Fix up a few trivial conflicts in various drivers, and do an "evil merge" to catch some new uses that have come in since Cong's tree. * 'kmap_atomic' of git://github.com/congwang/linux: (59 commits) feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] drbd: remove the second argument of k[un]map_atomic() zcache: remove the second argument of k[un]map_atomic() gma500: remove the second argument of k[un]map_atomic() dm: remove the second argument of k[un]map_atomic() tomoyo: remove the second argument of k[un]map_atomic() sunrpc: remove the second argument of k[un]map_atomic() rds: remove the second argument of k[un]map_atomic() net: remove the second argument of k[un]map_atomic() mm: remove the second argument of k[un]map_atomic() lib: remove the second argument of k[un]map_atomic() power: remove the second argument of k[un]map_atomic() kdb: remove the second argument of k[un]map_atomic() udf: remove the second argument of k[un]map_atomic() ubifs: remove the second argument of k[un]map_atomic() squashfs: remove the second argument of k[un]map_atomic() reiserfs: remove the second argument of k[un]map_atomic() ocfs2: remove the second argument of k[un]map_atomic() ntfs: remove the second argument of k[un]map_atomic() ...		2012-03-21 09:40:26 -07:00
..
acl.c	Btrfs: fix return value of btrfs_get_acl()	2011-10-20 18:10:47 +02:00
async-thread.c	Merge branch 'pm-sleep' into pm-for-linus	2011-12-25 23:42:20 +01:00
async-thread.h	Btrfs: fix num_workers_starting bug and other bugs in async thread	2011-12-15 11:04:21 -05:00
backref.c	btrfs: fix locking issues in find_parent_nodes()	2012-03-03 07:41:15 -05:00
backref.h	Btrfs: added btrfs_find_all_roots()	2012-01-04 16:26:38 +01:00
btrfs_inode.h	Btrfs: add a delalloc mutex to inodes for delalloc reservations	2012-01-16 15:29:43 -05:00
check-integrity.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
check-integrity.h	Btrfs: add optional integrity check code	2011-12-21 19:14:09 +01:00
compat.h	Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code	2009-01-06 09:38:55 -05:00
compression.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
compression.h	btrfs: rename variables clashing with global function names	2011-05-02 13:57:19 +02:00
ctree.c	Btrfs: mark delayed refs as for cow	2011-12-22 16:22:27 +01:00
ctree.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-02-24 09:02:53 -08:00
delayed-inode.c	Btrfs: space leak tracepoints	2012-01-16 15:29:43 -05:00
delayed-inode.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
delayed-ref.c	Btrfs: add waitqueue instead of doing busy waiting for more delayed refs	2012-01-04 16:12:48 +01:00
delayed-ref.h	Btrfs: add waitqueue instead of doing busy waiting for more delayed refs	2012-01-04 16:12:48 +01:00
dir-item.c	Btrfs: remove redundant code for dir item lookup	2011-08-01 14:30:48 -04:00
disk-io.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-02-24 09:02:53 -08:00
disk-io.h	btrfs: take allocation of ->tree_root into open_ctree()	2012-01-08 19:37:02 -05:00
export.c	btrfs: let ->s_fs_info point to fs_info, not root...	2012-01-08 19:35:37 -05:00
export.h	NFS support for btrfs - v3	2008-09-25 11:04:06 -04:00
extent_io.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
extent_io.h	btrfs: delalloc for page dirtied out-of-band in fixup worker	2012-02-15 16:40:25 +01:00
extent_map.c	Btrfs: clean up code for merging extent maps	2011-08-01 14:30:50 -04:00
extent_map.h	btrfs: fix structs where bitfields and spinlock/atomic share 8B word	2012-02-15 16:40:25 +01:00
extent-tree.c	Btrfs: fix compiler warnings on 32 bit systems	2012-02-24 10:39:05 -05:00
file-item.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
file.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-02-24 09:02:53 -08:00
free-space-cache.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
free-space-cache.h	btrfs: remove all unused functions	2011-05-06 12:34:03 +02:00
hash.h	Btrfs: remove crc32c.h and use libcrc32c directly.	2009-06-10 11:29:53 -04:00
inode-item.c	Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item	2011-05-23 13:24:39 -04:00
inode-map.c	Btrfs: fix compiler warnings on 32 bit systems	2012-02-24 10:39:05 -05:00
inode-map.h	Btrfs: Support reading/writing on disk free ino cache	2011-04-25 16:46:11 +08:00
inode.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
ioctl.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-02-24 09:02:53 -08:00
ioctl.h	Btrfs: add balance progress reporting	2012-01-16 22:04:49 +02:00
Kconfig	Btrfs: add config option to enable btrfs integrity check	2011-12-21 19:14:16 +01:00
locking.c	Btrfs: add nested locking mode for paths	2012-01-04 16:12:29 +01:00
locking.h	Btrfs: switch the btrfs tree locks to reader/writer	2011-07-27 12:46:46 -04:00
lzo.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
Makefile	Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration	2012-01-16 15:27:58 -05:00
ordered-data.c	Btrfs: add initial tracepoint support for btrfs	2011-03-28 05:37:33 -04:00
ordered-data.h	btrfs: Allow to add new compression algorithm	2010-12-22 23:15:45 +08:00
orphan.c	Btrfs: fixup return code for btrfs_del_orphan_item	2010-12-09 13:57:15 -05:00
print-tree.c	btrfs: fix oops on failure path	2011-10-20 18:10:50 +02:00
print-tree.h	Btrfs: Create extent_buffer interface for large blocksizes	2008-09-25 11:03:56 -04:00
reada.c	Btrfs: fix casting error in scrub reada code	2012-03-03 07:42:35 -05:00
relocation.c	Btrfs: add a delalloc mutex to inodes for delalloc reservations	2012-01-16 15:29:43 -05:00
root-tree.c	btrfs: make btrfs_set_root_node void	2011-08-01 14:30:44 -04:00
scrub.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
struct-funcs.c	Btrfs: stop using highmem for extent_buffers	2011-07-27 12:46:45 -04:00
super.c	Merge branch 'btrfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-17 15:52:51 -08:00
sysfs.c	btrfs: Remove unused sysfs code	2011-06-17 14:54:18 -04:00
transaction.c	Btrfs: fix compiler warnings on 32 bit systems	2012-02-24 10:39:05 -05:00
transaction.h	Merge branch 'for-chris' of	2011-05-28 07:00:39 -04:00
tree-defrag.c	btrfs: drop unused parameter from btrfs_release_path	2011-05-02 13:57:22 +02:00
tree-log.c	btrfs: Fix busyloops in transaction waiting code	2012-01-26 15:01:11 -05:00
tree-log.h	btrfs: remove unused function prototypes	2011-05-04 14:01:26 +02:00
ulist.c	Btrfs: generic data structure to build unique lists	2011-12-22 16:22:24 +01:00
ulist.h	Btrfs: generic data structure to build unique lists	2011-12-22 16:22:24 +01:00
version.h	Update Btrfs files for in-kernel usage	2008-09-25 15:41:59 -04:00
volumes.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-02-24 09:02:53 -08:00
volumes.h	Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration	2012-01-16 15:26:17 -05:00
xattr.c	Btrfs: do not use btrfs_end_transaction_throttle everywhere	2012-01-16 15:28:54 -05:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
zlib.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00