summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...Linus Torvalds2017-11-1313-14/+238
|\
| * m68k: add Sysam stmark2 open board supportAngelo Dureghello2017-11-074-1/+219
| * m68k: coldfire: add dspi0 module supportAngelo Dureghello2017-11-072-1/+8
| * m68k: pull mach_beep in setup.cAlexandre Belloni2017-11-062-4/+5
| * m68k: allow ColdFire m5441x parts to run with MMU enabledGreg Ungerer2017-11-061-1/+1
| * m68k: fix ColdFire node shift size calculationGreg Ungerer2017-11-061-1/+1
| * m68k: move coldfire MMU initialization codeGreg Ungerer2017-11-065-6/+4
* | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-11-1319-125/+164
|\ \
| * | ima: Remove redundant conditional operatorThiago Jung Bauermann2017-11-081-2/+2
| * | ima: Fix bool initialization/comparisonThomas Meyer2017-11-082-4/+4
| * | ima: check signature enforcement against cmdline param instead of CONFIGBruno E. O. Meneguele2017-11-081-3/+3
| * | module: export module signature enforcement statusBruno E. O. Meneguele2017-11-082-0/+17
| * | ima: fix hash algorithm initializationBoshi Wang2017-11-081-0/+4
| * | EVM: Only complain about a missing HMAC key onceMatthew Garrett2017-11-081-1/+1
| * | EVM: Allow userspace to signal an RSA key has been loadedMatthew Garrett2017-11-083-26/+53
| * | EVM: Include security.apparmor in EVM measurementsMatthew Garrett2017-11-082-0/+6
| * | ima: call ima_file_free() prior to calling fasyncMimi Zohar2017-11-081-1/+1
| * | integrity: use kernel_read_file_from_path() to read x509 certsChristoph Hellwig2017-11-085-56/+14
| * | ima: always measure and audit files in policyMimi Zohar2017-11-083-30/+56
| * | ima: don't remove the securityfs policy fileMimi Zohar2017-11-081-2/+2
| * | vfs: fix mounting a filesystem with i_versionMimi Zohar2017-11-081-1/+2
* | | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2017-11-1317-279/+385
|\| |
| * | MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entriesMimi Zohar2017-11-061-7/+4
| * | Smack: Base support for overlayfsCasey Schaufler2017-11-021-0/+79
| * | MAINTAINERS: remove David Safford as maintainer for encrypted+trusted keysEric Biggers2017-10-271-2/+0
| * | tomoyo: fix timestamping for y2038Arnd Bergmann2017-10-214-34/+13
| * | capabilities: audit log other surprising conditionsRichard Guy Briggs2017-10-201-7/+22
| * | capabilities: fix logic for effective root or real rootRichard Guy Briggs2017-10-201-3/+2
| * | capabilities: invert logic for clarityRichard Guy Briggs2017-10-201-4/+4
| * | capabilities: remove a layer of conditional logicRichard Guy Briggs2017-10-201-13/+10
| * | capabilities: move audit log decision to functionRichard Guy Briggs2017-10-201-20/+30
| * | capabilities: use intuitive names for id changesRichard Guy Briggs2017-10-201-6/+22
| * | capabilities: use root_priveleged inline to clarify logicRichard Guy Briggs2017-10-201-2/+4
| * | capabilities: rename has_cap to has_fcapRichard Guy Briggs2017-10-201-10/+10
| * | capabilities: intuitive names for cap gain statusRichard Guy Briggs2017-10-201-7/+11
| * | capabilities: factor out cap_bprm_set_creds privileged rootRichard Guy Briggs2017-10-201-28/+48
| * | tpm, tpm_tis: use ARRAY_SIZE() to define TPM_HID_USR_IDXJérémy Lefaure2017-10-181-1/+2
| * | tpm: fix duplicate inline declaration specifierRuben Roy2017-10-181-1/+1
| * | tpm: fix type of a local variables in tpm_tis_spi.cJarkko Sakkinen2017-10-181-7/+18
| * | tpm: fix type of a local variable in tpm2_map_command()Jarkko Sakkinen2017-10-181-2/+2
| * | tpm: fix type of a local variable in tpm2_get_cc_attrs_tbl()Jarkko Sakkinen2017-10-181-2/+2
| * | tpm-dev-common: Reject too short writesAlexander Steffen2017-10-181-0/+6
| * | tpm: React correctly to RC_TESTING from TPM 2.0 self testsAlexander Steffen2017-10-181-41/+11
| * | tpm: Use dynamic delay to wait for TPM 2.0 self test resultAlexander Steffen2017-10-181-8/+9
| * | tpm: Trigger only missing TPM 2.0 self testsAlexander Steffen2017-10-181-2/+2
| * | tpm_tis_spi: Use DMA-safe memory for SPI transfersAlexander Steffen2017-10-181-18/+27
| * | tpm/tpm_crb: Use start method value from ACPI table directlyJiandi An2017-10-181-30/+29
| * | tpm: constify transmit data pointersArnd Bergmann2017-10-184-19/+16
| * | tpm_tis: make array cmd_getticks static const to shrink object code sizeColin Ian King2017-10-181-1/+1
| * | tpm: migrate pubek_show to struct tpm_bufJarkko Sakkinen2017-10-122-52/+48