summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-12-041-6/+5
|\
| * selinux: Remove security_ops externYao Dongdong2014-12-011-2/+0
| * selinux: convert WARN_ONCE() to printk() in selinux_nlmsg_perm()Richard Guy Briggs2014-11-121-3/+4
| * selinux: fix inode security list corruptionStephen Smalley2014-10-151-1/+1
* | Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel in...James Morris2014-11-262-12/+18
|\ \
| * | security: smack: fix out-of-bounds access in smk_parse_smack()Andrey Ryabinin2014-11-211-4/+3
| * | Security: smack: replace kzalloc with kmem_cache for inode_smackRohit2014-10-311-3/+10
| * | Smack: Lock mode for the floor and hat labelsCasey Schaufler2014-10-281-5/+5
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-11-1918-141/+356
|\ \ \
| * | | VFS: refactor vfs_read()Dmitry Kasatkin2014-11-183-13/+22
| * | | ima: require signature based appraisalDmitry Kasatkin2014-11-182-0/+13
| * | | integrity: provide a hook to load keys when rootfs is readyDmitry Kasatkin2014-11-183-1/+22
| * | | ima: load x509 certificate from the kernelDmitry Kasatkin2014-11-184-2/+44
| * | | integrity: provide a function to load x509 certificate from the kernelDmitry Kasatkin2014-11-182-1/+37
| * | | integrity: define a new function integrity_read_file()Dmitry Kasatkin2014-11-183-32/+85
| * | | ima: added support for new kernel cmdline parameter ima_template_fmtRoberto Sassu2014-10-133-20/+52
| * | | ima: allocate field pointers array on demand in template_desc_init_fields()Roberto Sassu2014-10-131-21/+13
| * | | ima: don't allocate a copy of template_fmt in template_desc_init_fields()Roberto Sassu2014-10-131-13/+17
| * | | ima: display template format in meas. list if template name length is zeroRoberto Sassu2014-10-132-5/+15
| * | | ima: added error messages to template-related functionsRoberto Sassu2014-10-131-5/+17
| * | | ima: use atomic bit operations to protect policy update interfaceDmitry Kasatkin2014-10-122-28/+18
| * | | ima: ignore empty and with whitespaces policy linesDmitry Kasatkin2014-10-121-1/+2
| * | | ima: no need to allocate entry for commentDmitry Kasatkin2014-10-121-8/+6
| * | | ima: report policy load statusDmitry Kasatkin2014-10-121-0/+2
| * | | ima: use path names cacheDmitry Kasatkin2014-10-072-3/+4
| * | | evm: skip replacing EVM signature with HMAC on read-only filesystemDmitry Kasatkin2014-10-071-3/+8
| * | | integrity: add missing '__init' keyword for integrity_init_keyring()Dmitry Kasatkin2014-10-072-2/+2
| * | | ima: check ima_policy_flag in the ima_file_free() hookDmitry Kasatkin2014-10-073-7/+1
| |/ /
* | | Merge commit 'v3.17' into nextJames Morris2014-11-1910177-453885/+435505
|\ \ \ | |/ / |/| |
| * | Linux 3.17v3.17Linus Torvalds2014-10-051-1/+1
| * | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/...Linus Torvalds2014-10-054-7/+62
| |\ \
| | * | [SCSI] uas: disable use of blk-mq I/O pathChristoph Hellwig2014-10-031-0/+7
| | * | [SCSI] cxgb4i: avoid holding mutex in interrupt contextAnish Bhatt2014-10-013-7/+55
| * | | Merge tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-10-041-0/+3
| |\ \ \
| | * | | init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menuJosh Triplett2014-10-041-0/+1
| | * | | init/Kconfig: Hide printk log config if CONFIG_PRINTK=nJosh Triplett2014-10-041-0/+2
| | |/ /
| * | | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-10-032-5/+9
| |\ \ \
| | * | | i2c: qup: Fix order of runtime pm initializationAndy Gross2014-10-031-4/+8
| | * | | i2c: rk3x: fix 0 length write transfersAlexandru M Stan2014-10-031-1/+1
| * | | | Merge tag 'trace-fixes-v3.17-rc7' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-10-031-1/+1
| |\ \ \ \
| | * | | | ring-buffer: Fix infinite spin in reading bufferSteven Rostedt (Red Hat)2014-10-021-1/+1
| | |/ / /
| * | | | Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2014-10-033-8/+4
| |\ \ \ \
| | * | | | CIFS: Fix readpages retrying on reconnectsPavel Shilovsky2014-10-021-7/+1
| | * | | | Fix problem recognizing symlinksSteve French2014-10-022-1/+3
| * | | | | Merge tag 'md/3.17-final-fix' of git://neil.brown.name/mdLinus Torvalds2014-10-031-1/+17
| |\ \ \ \ \
| | * | | | | md/raid5: disable 'DISCARD' by default due to safety concerns.NeilBrown2014-10-021-1/+17
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2014-10-038-62/+65
| |\ \ \ \ \
| | * \ \ \ \ Merge tag 'drm-intel-fixes-2014-10-02' of git://anongit.freedesktop.org/drm-i...Dave Airlie2014-10-031-1/+13
| | |\ \ \ \ \
| | | * | | | | drm/i915: Flush the PTEs after updating them before suspendChris Wilson2014-09-291-1/+13
| | | |/ / / /
| | * | | | | Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-...Dave Airlie2014-10-027-61/+52
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |