summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2013-09-0727-104/+177
|\
| * userns: Kill nsown_capable it makes the wrong thing easyEric W. Biederman2013-08-3012-34/+21
| * capabilities: allow nice if we are privilegedSerge Hallyn2013-08-301-4/+4
| * pidns: Don't have unshare(CLONE_NEWPID) imply CLONE_THREADEric W. Biederman2013-08-301-5/+0
| * userns: Allow PR_CAPBSET_DROP in a user namespace.Eric W. Biederman2013-08-301-1/+1
| * namespaces: Simplify copy_namespaces so it is clear what is going on.Eric W. Biederman2013-08-301-24/+11
| * pidns: Fix hang in zap_pid_ns_processes by sending a potentially extra wakeupEric W. Biederman2013-08-301-0/+1
| * sysfs: Restrict mounting sysfsEric W. Biederman2013-08-284-3/+34
| * userns: Better restrictions on when proc and sysfs can be mountedEric W. Biederman2013-08-267-23/+33
| * vfs: Don't copy mount bind mounts of /proc/<pid>/ns/mnt between namespacesEric W. Biederman2013-08-262-13/+38
| * kernel/nsproxy.c: Improving a snippet of code.Raphael S.Carvalho2013-08-261-1/+2
| * proc: Restrict mounting the proc filesystemEric W. Biederman2013-08-261-1/+2
| * vfs: Lock in place mounts from more privileged usersEric W. Biederman2013-07-242-0/+35
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2013-09-0732-554/+1673
|\ \
| * \ Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-08-234-114/+150
| |\ \
| | * | Smack: parse multiple rules per write to load2, up to PAGE_SIZE-1 bytesRafal Krypa2013-08-121-85/+82
| | * | Smack: network label match fixCasey Schaufler2013-08-013-9/+31
| | * | security: smack: add a hash table to quicken smk_find_entry()Tomasz Stanislawski2013-08-013-9/+37
| | * | security: smack: fix memleak in smk_write_rules_list()Tomasz Stanislawski2013-08-011-22/+11
| * | | apparmor: add the ability to report a sha1 hash of loaded policyJohn Johansen2013-08-148-6/+199
| * | | apparmor: export set of capabilities supported by the apparmor moduleJohn Johansen2013-08-144-1/+15
| * | | apparmor: add the profile introspection file to interfaceJohn Johansen2013-08-141-0/+236
| * | | apparmor: add an optional profile attachment string for profilesJohn Johansen2013-08-144-0/+40
| * | | apparmor: add interface files for profiles and namespacesJohn Johansen2013-08-147-29/+436
| * | | apparmor: allow setting any profile into the unconfined stateJohn Johansen2013-08-145-9/+22
| * | | apparmor: make free_profile available outside of policy.cJohn Johansen2013-08-143-7/+7
| * | | apparmor: rework namespace free pathJohn Johansen2013-08-142-35/+10
| * | | apparmor: update how unconfined is handledJohn Johansen2013-08-143-83/+67
| * | | apparmor: change how profile replacement update is doneJohn Johansen2013-08-146-87/+125
| * | | apparmor: convert profile lists to RCU based lockingJohn Johansen2013-08-144-111/+167
| * | | apparmor: provide base for multiple profiles to be replaced at onceJohn Johansen2013-08-144-146/+283
| * | | apparmor: add a features/policy dir to interfaceJohn Johansen2013-08-141-0/+5
| * | | apparmor: enable users to query whether apparmor is enabledJohn Johansen2013-08-141-1/+1
| * | | apparmor: remove minimum size check for vmalloc()Tetsuo Handa2013-08-141-5/+0
| * | | xattr: Constify ->name member of "struct xattr".Tetsuo Handa2013-07-259-31/+21
| |/ /
| * | Merge branch 'linus-master'; commit 'v3.11-rc2' into ra-nextJames Morris2013-07-230-0/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2013-09-0756-1364/+3405
|\ \ \
| * | | Reinstate "crypto: crct10dif - Wrap crc_t10dif function all to use crypto tra...Herbert Xu2013-09-0712-43/+1082
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linuxHerbert Xu2013-09-074397-171323/+248661
| |\ \ \
| * | | | hwrng: via - Add MODULE_DEVICE_TABLEBen Hutchings2013-09-021-0/+7
| * | | | crypto: fcrypt - Fix bitoperation for compilation with clangJan-Simon Möller2013-09-021-1/+1
| * | | | crypto: nx - fix SHA-2 for chunks bigger than block sizeMarcelo Cerri2013-09-022-2/+2
| * | | | crypto: nx - fix GCM for zero length messagesMarcelo Cerri2013-09-021-20/+112
| * | | | crypto: nx - fix XCBC for zero length messagesMarcelo Cerri2013-09-021-7/+77
| * | | | crypto: nx - fix limits to sg lists for AES-CCMFionnuala Gunter2013-09-021-75/+208
| * | | | crypto: nx - fix limits to sg lists for AES-XCBCFionnuala Gunter2013-09-021-47/+66
| * | | | crypto: nx - fix limits to sg lists for AES-GCMMarcelo Cerri2013-09-021-66/+136
| * | | | crypto: nx - fix limits to sg lists for AES-CTRMarcelo Cerri2013-09-021-19/+31
| * | | | crypto: nx - fix limits to sg lists for AES-CBCMarcelo Cerri2013-09-021-23/+33
| * | | | crypto: nx - fix limits to sg lists for AES-ECBMarcelo Cerri2013-09-021-18/+30