Linus Torvalds 0f6e0e8448 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits) AppArmor: kill unused macros in lsm.c AppArmor: cleanup generated files correctly KEYS: Add an iovec version of KEYCTL_INSTANTIATE KEYS: Add a new keyctl op to reject a key with a specified error code KEYS: Add a key type op to permit the key description to be vetted KEYS: Add an RCU payload dereference macro AppArmor: Cleanup make file to remove cruft and make it easier to read SELinux: implement the new sb_remount LSM hook LSM: Pass -o remount options to the LSM SELinux: Compute SID for the newly created socket SELinux: Socket retains creator role and MLS attribute SELinux: Auto-generate security_is_socket_class TOMOYO: Fix memory leak upon file open. Revert "selinux: simplify ioctl checking" selinux: drop unused packet flow permissions selinux: Fix packet forwarding checks on postrouting selinux: Fix wrong checks for selinux_policycap_netpeer selinux: Fix check for xfrm selinux context algorithm ima: remove unnecessary call to ima_must_measure IMA: remove IMA imbalance checking ...		2011-03-16 09:15:43 -07:00
..
basic	kbuild: Fix computing srcversion for modules	2011-03-13 15:59:58 -07:00
coccinelle	scripts/coccinelle: update for compatability with Coccinelle 0.2.4	2010-12-03 12:27:01 +01:00
dtc	of/flattree: Update dtc to current mainline.	2011-01-03 16:02:49 -07:00
genksyms	scripts/genksyms: fix header usage	2010-11-25 16:25:06 +01:00
kconfig	trivial: Fix Steven's Copyright typos	2011-02-08 17:14:31 -05:00
ksymoops	…
mod	kbuild: Fix computing srcversion for modules	2011-03-13 15:59:58 -07:00
package	Merge branch 'kbuild/packaging' into kbuild/rc-fixes	2011-02-04 15:01:57 +01:00
rt-tester	rtmutex: tester: Remove the remaining BKL leftovers	2011-02-22 22:07:22 +01:00
selinux	SELinux: Auto-generate security_is_socket_class	2011-03-03 15:19:43 -05:00
tracing	tracing, perf: Convert the power tracer into an event tracer	2009-09-19 11:42:12 +02:00
.gitignore	gitignore: add scripts/recordmcount	2010-11-25 15:49:50 +01:00
Kbuild.include	kbuild: generate modules.builtin	2009-12-12 13:08:16 +01:00
Lindent	…
Makefile	ftrace/x86: Add support for C version of recordmcount	2010-10-14 16:52:41 -04:00
Makefile.build	ftrace: Speed up recordmcount	2010-11-18 17:16:05 -05:00
Makefile.clean	kbuild: Really don't clean bounds.h and asm-offsets.h	2010-03-11 11:15:22 +01:00
Makefile.fwinst	…
Makefile.headersinst	kbuild: drop unifdef-y support	2010-08-14 22:26:52 +02:00
Makefile.help	Add a target to use the Coccinelle checker	2010-06-12 00:00:29 +02:00
Makefile.host	…
Makefile.lib	decompressors: add XZ decompressor module	2011-01-13 08:03:24 -08:00
Makefile.modbuiltin	kbuild: Create output directory in Makefile.modbuiltin	2010-06-10 12:23:08 +02:00
Makefile.modinst	Revert "kbuild: strip generated symbols from *.ko"	2009-01-14 21:38:20 +01:00
Makefile.modpost	trivial: fix a typo in a filename	2010-08-03 14:59:50 +02:00
bin2c.c	…
bloat-o-meter	…
bootgraph.pl	bootgraph: fix for use with dot symbols	2009-02-15 12:50:08 +01:00
checkincludes.pl	checkincludes: fix perlcritic warnings	2010-03-07 21:19:57 +01:00
checkkconfigsymbols.sh	checkkconfigsymbols.sh: Kconfig symbols sometimes have lowercase letters	2010-06-03 10:39:39 +02:00
checkpatch.pl	locking: Remove deprecated lock initializers	2011-01-27 12:30:38 +01:00
checkstack.pl	scripts: improve checkstack	2010-03-07 21:19:09 +01:00
checksyscalls.sh	checksyscalls: Fix stand-alone usage	2010-12-20 15:40:33 +01:00
checkversion.pl	checkversion: perl cleanup	2010-03-07 21:22:56 +01:00
cleanfile	…
cleanpatch	…
coccicheck	Coccinelle: Add contextual message	2010-10-28 00:32:23 +02:00
config	kbuild: add numeric --set-val option to scripts/config	2010-12-15 15:44:31 +01:00
conmakehash.c	Fix all -Wmissing-prototypes warnings in x86 defconfig	2009-09-23 07:39:28 -07:00
decodecode	scripts: decodecode: remove bashisms	2010-06-04 10:26:35 +02:00
diffconfig	…
export_report.pl	export_report: fix perl warnings	2010-03-07 21:41:04 +01:00
extract-ikconfig	scripts/extract-ikconfig: add support for bzip2, lzma and lzo	2010-10-28 00:22:17 +02:00
gcc-goto.sh	jump label: Fix GCC feature check when distcc is used	2010-09-24 09:12:25 +02:00
gcc-version.sh	Remove bashisms from scripts	2009-06-09 22:37:54 +02:00
gcc-x86_32-has-stack-protector.sh	stackprotector: fix multi-word cross-builds	2009-02-11 12:17:29 +01:00
gcc-x86_64-has-stack-protector.sh	stackprotector: fix multi-word cross-builds	2009-02-11 12:17:29 +01:00
gen_initramfs_list.sh	decompressors: add boot-time XZ support	2011-01-13 08:03:25 -08:00
get_maintainer.pl	scripts/get_maintainer.pl: use --git-fallback more often	2011-01-13 08:03:10 -08:00
gfp-translate	scripts: fix gfp-translate for recent changes to gfp.h	2010-11-25 06:50:49 +09:00
headerdep.pl	headerdep: perlcritic warning	2010-03-23 12:26:38 +01:00
headers.sh	kbuild: introduce HDR_ARCH_LIST for headers_install_all	2010-12-14 22:16:19 +01:00
headers_check.pl	headers_check: Fix warning text	2010-12-14 17:05:08 +01:00
headers_install.pl	headers_install: check exit status of unifdef	2010-12-14 15:06:04 +01:00
kallsyms.c	scripts/kallsyms: Enable error messages while hush up unnecessary warnings	2010-09-29 16:18:27 +02:00
kernel-doc	kernel-doc: code reorganization	2011-01-06 09:59:38 -08:00
makelst	…
markup_oops.pl	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
mkcompile_h	scripts/mkcompile_h: don't test for hardcoded paths	2010-02-02 14:33:56 +01:00
mkmakefile	fixes for using make 3.82	2010-08-17 11:47:40 +02:00
mksysmap	Revert "kbuild: strip generated symbols from *.ko"	2009-01-14 21:38:20 +01:00
mkuboot.sh	mkuboot.sh: Fail if mkimage is missing	2011-01-07 14:31:01 +01:00
mkversion	…
module-common.lds	linker script: throw away .discard section	2009-06-24 15:13:38 +09:00
namespace.pl	Revert "namespace: add source file location exceptions"	2010-10-28 00:59:56 +02:00
patch-kernel	…
pnmtologo.c	fbdev: work around old compiler bug	2009-06-30 18:55:59 -07:00
profile2linkerlist.pl	profile2linkerlist: fix perl warnings	2010-03-07 21:39:33 +01:00
recordmcount.c	ftrace: Add .ref.text as one of the safe areas to trace	2011-03-10 10:34:39 -05:00
recordmcount.h	Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel	2011-01-05 18:08:10 +00:00
recordmcount.pl	ftrace: Add .ref.text as one of the safe areas to trace	2011-03-10 10:34:39 -05:00
setlocalversion	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 15:13:55 -07:00
show_delta	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
tags.sh	Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-01-10 08:29:25 -08:00
unifdef.c	unifdef: update to upstream revision 1.190	2009-12-12 13:08:16 +01:00
ver_linux	Remove bashisms from scripts	2009-06-09 22:37:54 +02:00
xz_wrap.sh	decompressors: add XZ decompressor module	2011-01-13 08:03:24 -08:00