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
..
afs_cm.h	afs: support the CB.ProbeUuid RPC op	2008-04-29 08:06:26 -07:00
afs_fs.h	AFS: implement file locking	2007-07-16 09:05:43 -07:00
afs_vl.h	AFS: Fix silly characters in a comment	2011-07-20 20:48:03 -04:00
afs.h	AFS: implement file locking	2007-07-16 09:05:43 -07:00
cache.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
callback.c	Fix various old email addresses for dwmw2	2008-06-06 11:29:10 -07:00
cell.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
cmservice.c	afs: add afs_wq and use it instead of the system workqueue	2011-01-14 09:25:11 -08:00
dir.c	switch ->create() to umode_t	2012-01-03 22:54:53 -05:00
file.c	AFS: checking wrong bit in afs_readpages()	2012-03-20 11:14:38 -07:00
flock.c	fs/locks.c: prepare for BKL removal	2010-10-05 11:02:04 +02:00
fsclient.c	afs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:22 +08:00
inode.c	filesystems: add set_nlink()	2011-11-02 12:53:43 +01:00
internal.h	afs: Read of file returns EBADMSG	2012-03-16 17:01:41 -07:00
Kconfig	DNS: Make AFS go to the DNS for AFSDB records for unknown cells	2010-08-05 17:17:51 +00:00
main.c	afs: add afs_wq and use it instead of the system workqueue	2011-01-14 09:25:11 -08:00
Makefile	FS-Cache: Make kAFS use FS-Cache	2009-04-03 16:42:41 +01:00
misc.c	AFS: Correctly translate auth error aborts and don't failover in such cases	2009-06-16 21:20:14 -07:00
mntpt.c	afs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:22 +08:00
netdevices.c	afs: BUG to BUG_ON changes	2009-04-09 10:41:19 -07:00
proc.c	AFS: Implement an autocell mount capability [ver #2]	2010-08-11 17:11:29 +00:00
rxrpc.c	afs: Remote abort can cause BUG in rxrpc code	2012-03-16 17:01:41 -07:00
security.c	->permission() sanitizing: don't pass flags to ->permission()	2011-07-20 01:43:24 -04:00
server.c	afs: add afs_wq and use it instead of the system workqueue	2011-01-14 09:25:11 -08:00
super.c	vfs: fix the stupidity with i_dentry in inode destructors	2012-01-03 22:52:40 -05:00
vlclient.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
vlocation.c	afs: add afs_wq and use it instead of the system workqueue	2011-01-14 09:25:11 -08:00
vnode.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
volume.c	afs: add bdi backing to mount session.	2010-04-22 11:58:18 +02:00
write.c	fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers	2011-07-20 20:47:59 -04:00