You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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() ...		13 years ago
..
apparmor	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	13 years ago
integrity	ima: fix cred sparse warning	13 years ago
keys	Merge git://git.samba.org/sfrench/cifs-2.6	13 years ago
selinux	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	13 years ago
smack	vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb	13 years ago
tomoyo	tomoyo: remove the second argument of k[un]map_atomic()	13 years ago
Kconfig	encrypted-keys: remove trusted-keys dependency	14 years ago
Makefile	integrity: move ima inode integrity data management	14 years ago
capability.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	13 years ago
commoncap.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	13 years ago
device_cgroup.c	cgroup: remove cgroup_subsys argument from callbacks	13 years ago
inode.c	securityfs: fix object creation races	13 years ago
lsm_audit.c	audit: no leading space in audit_log_d_path prefix	13 years ago
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	15 years ago
security.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	13 years ago