summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-21180-969/+921
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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() ...
| * feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() ↵Cong Wang2012-03-201-0/+8
| | | | | | | | | | | | for removal Signed-off-by: Cong Wang <amwang@redhat.com>
| * highmem: kill all __kmap_atomic()Cong Wang2012-03-2016-29/+24
| | | | | | | | | | | | | | [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Cong Wang <amwang@redhat.com>
| * drbd: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-7/+7
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * zcache: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-8/+8
| | | | | | | | | | Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Cong Wang <amwang@redhat.com>
| * gma500: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-15/+15
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * dm: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-4/+4
| | | | | | | | | | Acked-by: Milan Broz <mbroz@redhat.com> Signed-off-by: Cong Wang <amwang@redhat.com>
| * tomoyo: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Cong Wang <amwang@redhat.com>
| * sunrpc: remove the second argument of k[un]map_atomic()Cong Wang2012-03-204-18/+18
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * rds: remove the second argument of k[un]map_atomic()Cong Wang2012-03-207-21/+16
| | | | | | | | | | Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com>
| * net: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com>
| * mm: remove the second argument of k[un]map_atomic()Cong Wang2012-03-207-35/+35
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * lib: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-5/+4
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * power: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-14/+14
| | | | | | | | | | Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Cong Wang <amwang@redhat.com>
| * kdb: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * udf: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Acked-by: Jan Kara <jack@suse.cz> Signed-off-by: Cong Wang <amwang@redhat.com>
| * ubifs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * squashfs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-6/+6
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * reiserfs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-4/+4
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * ocfs2: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-8/+8
| | | | | | | | | | Acked-by: Joel Becker <jlbec@evilplan.org> Signed-off-by: Cong Wang <amwang@redhat.com>
| * ntfs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-204-32/+32
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * nilfs2: remove the second argument of k[un]map_atomic()Cong Wang2012-03-209-114/+114
| | | | | | | | | | Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Cong Wang <amwang@redhat.com>
| * nfs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-6/+6
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * minix: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * logfs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-203-30/+30
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * jbd2: remove the second argument of k[un]map_atomic()Cong Wang2012-03-203-10/+10
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * jbd: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-8/+8
| | | | | | | | | | Acked-by: Jan Kara <jack@suse.cz> Signed-off-by: Cong Wang <amwang@redhat.com>
| * gfs2: remove the second argument of k[un]map_atomic()Cong Wang2012-03-203-12/+12
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * fuse: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-4/+4
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * ext2: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Acked-by: Jan Kara <jack@suse.cz> Signed-off-by: Cong Wang <amwang@redhat.com>
| * exofs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Ack-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Cong Wang <amwang@redhat.com>
| * afs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-6/+6
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * btrfs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-207-37/+37
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * fs: remove the second argument of k[un]map_atomic()Cong Wang2012-03-207-37/+34
| | | | | | | | | | Acked-by: Benjamin LaHaise <bcrl@kvack.org> Signed-off-by: Cong Wang <amwang@redhat.com>
| * vhost: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * target: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-8/+6
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * zram: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-42/+41
| | | | | | | | | | Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Cong Wang <amwang@redhat.com>
| * rtl8192u: remove the second argument of k[un]map_atomic()Cong Wang2012-03-205-59/+13
| | | | | | | | | | Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Cong Wang <amwang@redhat.com>
| * hv: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-17/+14
| | | | | | | | | | Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Cong Wang <amwang@redhat.com>
| * scsi: remove the second argument of k[un]map_atomic()Cong Wang2012-03-2019-69/+64
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * net: remove the second argument of k[un]map_atomic()Cong Wang2012-03-203-12/+8
| | | | | | | | | | Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com>
| * memstick: remove the second argument of k[un]map_atomic()Cong Wang2012-03-202-4/+4
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * media: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Acked-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Cong Wang <amwang@redhat.com>
| * md: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-21/+21
| | | | | | | | | | Acked-by: NeilBrown <neilb@suse.de> Signed-off-by: Cong Wang <amwang@redhat.com>
| * infiniband: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-4/+4
| | | | | | | | | | Acked-by: Roland Dreier <roland@purestorage.com> Signed-off-by: Cong Wang <amwang@redhat.com>
| * ide: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | | | Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com>
| * drm: remove the second argument of k[un]map_atomic()Cong Wang2012-03-203-15/+15
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * edac: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * crypto: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-5/+5
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>
| * block: remove the second argument of k[un]map_atomic()Cong Wang2012-03-205-42/+42
| | | | | | | | Signed-off-by: Cong Wang <amwang@redhat.com>