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
..
iscsi	iscsi-target: Fix reservation conflict -EBUSY response handling bug	2012-03-13 21:43:58 -07:00
loopback	tcm_loop: bump max_sectors	2011-12-14 11:28:11 +00:00
tcm_fc	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
Kconfig	iscsi-target: Add iSCSI fabric support for target v4.1	2011-07-26 09:16:43 +00:00
Makefile	target: remove the ->transport_split_cdb callback in se_cmd	2011-10-24 03:21:15 +00:00
target_core_alua.c	target: Allow control CDBs with data > 1 page	2012-01-18 08:35:58 +00:00
target_core_alua.h	target: pass the se_task to the CDB emulation callback	2011-11-04 08:00:17 +00:00
target_core_cdb.c	target: accept REQUEST_SENSE with 18bytes	2012-02-07 06:32:39 +00:00
target_core_configfs.c	target: handle empty string writes in sysfs	2012-02-07 06:48:40 +00:00
target_core_device.c	target: Allow control CDBs with data > 1 page	2012-01-18 08:35:58 +00:00
target_core_fabric_configfs.c	target: fix return code of core_tpg_.*_lun	2012-01-18 08:33:44 +00:00
target_core_fabric_lib.c	target: remove useless casts	2011-12-14 11:28:07 +00:00
target_core_file.c	target: remove useless casts	2011-12-14 11:28:07 +00:00
target_core_file.h	target: make the ->get_cdb method optional	2011-10-24 03:21:11 +00:00
target_core_hba.c	target: header reshuffle, part2	2011-12-14 11:26:05 +00:00
target_core_iblock.c	iblock: fix handling of large requests	2012-02-07 06:48:46 +00:00
target_core_iblock.h	target: make the ->get_cdb method optional	2011-10-24 03:21:11 +00:00
target_core_internal.h	target: fix return code of core_tpg_.*_lun	2012-01-18 08:33:44 +00:00
target_core_pr.c	target: Fix compatible reservation handling (CRH=1) with legacy RESERVE/RELEASE	2012-03-13 21:43:43 -07:00
target_core_pr.h	target: Move core_scsi3_check_cdb_abort_and_preempt	2011-12-14 11:27:34 +00:00
target_core_pscsi.c	target: Allow control CDBs with data > 1 page	2012-01-18 08:35:58 +00:00
target_core_pscsi.h	target: cleanup pscsi request submission	2011-10-24 03:20:44 +00:00
target_core_rd.c	target: use \n as a separator for configuration	2011-12-14 11:27:23 +00:00
target_core_rd.h	target: make the ->get_cdb method optional	2011-10-24 03:21:11 +00:00
target_core_stat.c	target: remove useless casts	2011-12-14 11:28:07 +00:00
target_core_tmr.c	target: simplify target_check_cdb_and_preempt	2011-12-14 11:27:55 +00:00
target_core_tpg.c	target: fix return code of core_tpg_.*_lun	2012-01-18 08:33:44 +00:00
target_core_transport.c	target: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:20 +08:00
target_core_ua.c	target: header reshuffle, part2	2011-12-14 11:26:05 +00:00
target_core_ua.h	[SCSI] target: Add LIO target core v4.0.0-rc6	2011-01-14 10:12:29 -06:00