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
..
persistent-data
bitmap.c	md: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:18 +08:00
bitmap.h
dm-bio-record.h
dm-bufio.c	dm-bufio.c: there's no need to include linux/version.h	2012-02-03 22:38:12 +01:00
dm-bufio.h
dm-crypt.c	dm: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
dm-delay.c
dm-exception-store.c
dm-exception-store.h
dm-flakey.c	dm flakey: fix crash on read when corrupt_bio_byte not set	2012-03-07 19:09:39 +00:00
dm-io.c	dm io: fix discard support	2012-03-07 19:09:37 +00:00
dm-ioctl.c	dm ioctl: do not leak argv if target message only contains whitespace	2012-03-07 19:09:34 +00:00
dm-kcopyd.c
dm-linear.c	dm: do not forward ioctls from logical volumes to the underlying device	2012-01-14 15:07:24 -08:00
dm-log-userspace-base.c
dm-log-userspace-transfer.c
dm-log-userspace-transfer.h
dm-log.c
dm-mpath.c	dm: do not forward ioctls from logical volumes to the underlying device	2012-01-14 15:07:24 -08:00
dm-mpath.h
dm-path-selector.c
dm-path-selector.h
dm-queue-length.c
dm-raid1.c
dm-raid.c	dm raid: fix flush support	2012-03-07 19:09:48 +00:00
dm-region-hash.c
dm-round-robin.c
dm-service-time.c
dm-snap-persistent.c
dm-snap-transient.c
dm-snap.c
dm-stripe.c
dm-sysfs.c
dm-table.c	block: Introduce blk_set_stacking_limits function	2012-01-11 16:27:11 +01:00
dm-target.c
dm-thin-metadata.c	dm thin metadata: decrement counter after removing mapped block	2012-03-07 19:09:44 +00:00
dm-thin-metadata.h
dm-thin.c
dm-uevent.c
dm-uevent.h
dm-zero.c
dm.c
dm.h
faulty.c
Kconfig
linear.c
linear.h
Makefile
md.c	Some simple md-related fixes.	2012-02-08 19:06:30 -08:00
md.h
multipath.c
multipath.h
raid0.c
raid0.h
raid1.c	md/raid1: fix buglet in md_raid1_contested.	2012-02-13 14:24:05 +11:00
raid1.h
raid5.c
raid5.h
raid10.c	md/raid10: fix assembling of arrays with replacement devices.	2012-03-06 10:12:45 +11:00
raid10.h