summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2015-06-2846-1064/+155
|\
| * um: Don't pollute kernel namespace with uapiRichard Weinberger2015-06-256-1/+5
| * um: Include sys/types.h for makedev(), major(), minor()Hans-Werner Hilse2015-06-251-0/+1
| * um: Do not use stdin and stdout identifiers for struct membersHans-Werner Hilse2015-06-255-30/+30
| * um: Do not use __ptr_t type for stack_t's .ss pointerHans-Werner Hilse2015-06-251-3/+5
| * um: Fix mconsole dependencyRichard Weinberger2015-05-311-0/+1
| * um: Handle tracehook_report_syscall_entry() resultRichard Weinberger2015-05-313-5/+9
| * um: Remove copy&paste code from init.hRichard Weinberger2015-05-311-21/+1
| * um: Stop abusing __KERNEL__Richard Weinberger2015-05-315-10/+11
| * um: Catch unprotected user memory accessRichard Weinberger2015-05-311-0/+5
| * um: Fix warning in setup_signal_stack_si()Richard Weinberger2015-05-311-1/+2
| * um: Rework uaccess codeRichard Weinberger2015-05-317-184/+54
| * um: Add uaccess.h to ldt.cRichard Weinberger2015-05-311-0/+1
| * um: Add uaccess.h to syscalls_64.cRichard Weinberger2015-05-311-0/+1
| * um: Add asm/elf.h to vma.cRichard Weinberger2015-05-311-0/+1
| * um: Cleanup mem_32/64.c headersRichard Weinberger2015-05-312-4/+2
| * um: Remove hppfsRichard Weinberger2015-05-314-788/+0
| * um: Move syscall() declaration into os.hRichard Weinberger2015-05-312-1/+2
| * um: kernel: ksyms: Export symbol syscall() for fixing modpost issueChen Gang2015-05-311-0/+3
| * um/os-Linux: Use char[] for syscall_stub declarationsNicolas Iooss2015-05-312-7/+7
| * um: Use char[] for linker script address declarationsNicolas Iooss2015-05-314-7/+7
| * um: Create asm/sections.hNicolas Iooss2015-05-315-7/+11
* | Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfioLinus Torvalds2015-06-2810-19/+201
|\ \
| * | MAINTAINERS: Add vfio-platform sub-maintainerAlex Williamson2015-06-221-0/+6
| * | VFIO: platform: enable ARM64 buildEric Auger2015-06-221-1/+1
| * | VFIO: platform: Calxeda xgmac reset moduleEric Auger2015-06-226-0/+107
| * | VFIO: platform: populate the reset function on probeEric Auger2015-06-221-1/+36
| * | VFIO: platform: add reset callbackEric Auger2015-06-222-2/+14
| * | VFIO: platform: add reset struct and lookup tableEric Auger2015-06-172-0/+9
| * | vfio/pci: Fix racy vfio_device_get_from_dev() callAlex Williamson2015-06-092-15/+28
* | | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/auditLinus Torvalds2015-06-273-6/+4
|\ \ \
| * | | audit: Fix check of return value of strnlen_user()Jan Kara2015-06-111-1/+1
| * | | audit: obsolete audit_context check is removed in audit_filter_rules()Mikhail Klementyev2015-05-291-3/+1
| * | | audit: fix for typo in comment to function audit_log_link_denied()Shailendra Verma2015-05-291-1/+1
| * | | lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message typeRichard Guy Briggs2015-05-291-1/+1
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-06-2742-4089/+3741
|\ \ \ \
| * \ \ \ Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2015-06-186-25/+112
| |\ \ \ \
| | * | | | ima: update builtin policiesMimi Zohar2015-06-162-10/+65
| | * | | | ima: extend "mask" policy matching supportMimi Zohar2015-06-162-6/+17
| | * | | | ima: add support for new "euid" policy conditionMimi Zohar2015-06-162-5/+25
| | * | | | ima: fix ima_show_template_data_ascii()Mimi Zohar2015-06-163-4/+5
| * | | | | tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add()Jarkko Sakkinen2015-06-161-2/+2
| * | | | | vTPM: set virtual device before passing to ibmvtpm_reset_crqHon Ching \(Vicky\) Lo2015-06-161-2/+3
| * | | | | tpm_ibmvtpm: remove unneccessary message level.Fabian Frederick2015-06-161-1/+1
| |/ / / /
| * | | | Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-n...James Morris2015-06-131-7/+9
| |\ \ \ \
| | * | | | Smack: freeing an error pointer in smk_write_revoke_subj()Dan Carpenter2015-06-121-7/+9
| * | | | | selinux: fix setting of security labels on NFSJ. Bruce Fields2015-06-051-0/+1
| * | | | | selinux: Remove unused permission definitionsStephen Smalley2015-06-041-14/+8
| * | | | | selinux: enable genfscon labeling for sysfs and pstore filesStephen Smalley2015-06-041-1/+3
| * | | | | selinux: enable per-file labeling for debugfs files.Stephen Smalley2015-06-042-22/+22
OpenPOWER on IntegriCloud