summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit archi...Honggang LI2015-04-151-4/+6
* infiniband/mlx4: check for mapping errorSebastian Ott2015-04-152-0/+13
* MAINTAINERS: Adding list of maintainers for ocrdmaSelvin Xavier2015-04-151-0/+9
* rdma: replace deprecated ifconfig in docStephen Hemminger2015-04-151-3/+6
* ib_uverbs: Fix pages leak when using XRC SRQsSébastien Dugué2015-04-151-11/+11
* Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2015-04-1515-198/+174
|\
| * kconfig: Do not print status messages in make -s modeMichal Marek2015-04-096-32/+62
| * kconfig: Simplify MakefileMichal Marek2015-04-081-12/+8
| * kbuild: add generic mergeconfig target, %.configMasahiro Yamada2015-03-241-10/+9
| * merge_config.sh: rename MAKE to RUNMAKEMasahiro Yamada2015-03-241-3/+3
| * merge_config.sh: improve indentationMasahiro Yamada2015-03-241-8/+6
| * kbuild: mergeconfig: remove redundant $(objtree)Masahiro Yamada2015-03-241-1/+1
| * kbuild: mergeconfig: move an error check to merge_config.shMasahiro Yamada2015-03-242-1/+5
| * kbuild: mergeconfig: fix "jobserver unavailable" warningMasahiro Yamada2015-03-241-1/+1
| * kconfig: Remove unnecessary prototypes from headersMichal Marek2015-02-257-48/+40
| * kconfig: Remove dead codeMichal Marek2015-02-254-39/+0
| * kconfig: Get rid of the P() macro in headersMichal Marek2015-02-252-47/+43
| * kconfig: fix a misspelling in scripts/kconfig/merge_config.shMasahiro Yamada2015-02-251-1/+1
* | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2015-04-1511-48/+50
|\ \
| * | Kbuild: kallsyms: drop special handling of pre-3.0 GCC symbolsArd Biesheuvel2015-04-071-1/+0
| * | Kbuild: kallsyms: ignore veneers emitted by the ARM linkerArd Biesheuvel2015-04-071-9/+21
| * | kbuild: ia64: use $(src)/Makefile.gate rather than particular pathMasahiro Yamada2015-04-021-1/+1
| * | kbuild: include $(src)/Makefile rather than $(obj)/MakefileMasahiro Yamada2015-04-022-2/+2
| * | kbuild: use relative path more to include MakefileMasahiro Yamada2015-04-025-18/+16
| * | kbuild: use relative path to include MakefileMasahiro Yamada2015-04-024-4/+4
| * | kbuild: do not add $(bounds-file) and $(offsets-file) to targetsMasahiro Yamada2015-04-021-2/+1
| * | kbuild: remove warning about "make depend"Masahiro Yamada2015-03-241-6/+0
| * | kbuild: Don't reset timestamps in include/generated if not neededMichal Marek2015-03-241-9/+9
| |/
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-04-1531-1156/+1953
|\ \
| * | lsm: copy comm before calling audit_log to avoid race in string printingRichard Guy Briggs2015-04-151-6/+9
| * | Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/gi...James Morris2015-04-134-45/+15
| |\ \
| | * | tomoyo: Do not generate empty policy filesMichal Marek2015-04-073-29/+5
| | * | tomoyo: Use if_changed when generating builtin-policy.hMichal Marek2015-04-071-18/+11
| | * | tomoyo: Use bin2c to generate builtin-policy.hMichal Marek2015-04-072-10/+11
| | |/
| * | selinux: increase avtab max bucketsStephen Smalley2015-04-061-1/+1
| * | selinux: Use a better hash function for avtabJohn Brooks2015-04-062-5/+38
| * | selinux: convert avtab hash table to flex_arrayStephen Smalley2015-04-062-13/+22
| * | selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()Paul Moore2015-04-062-12/+4
| * | selinux: remove unnecessary pointer reassignmentJeff Vander Stoep2015-04-061-4/+2
| * | Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into nextJames Morris2015-04-025-69/+307
| |\ \
| | * | Smack: Updates for Smack documentationCasey Schaufler2015-03-311-50/+79
| | * | smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.cPaul Gortmaker2015-03-231-1/+0
| | * | Smack: Allow an unconfined label in bringup modeCasey Schaufler2015-03-234-17/+182
| | * | Smack: getting the Smack security context of keysJosé Bollo2015-03-231-0/+31
| | * | Smack: Assign smack_known_web as default smk_in label for kernel thread's socketMarcin Lis2015-03-231-1/+15
| * | | tpm/st33zp24/spi: Add missing device table for spi phy.Christophe Ricard2015-03-271-0/+7
| * | | tpm/st33zp24: Add proper wait for ordinal duration in case of irq modeChristophe Ricard2015-03-271-1/+11
| * | | tpm/tpm_infineon: Use struct dev_pm_ops for power managementPeter Huewe2015-03-181-25/+9
| * | | MAINTAINERS: Add Jason as designated reviewer for TPMPeter Huewe2015-03-181-0/+1
| * | | tpm: Update KConfig text to include TPM2.0 FIFO chipsPeter Huewe2015-03-181-4/+5
View Lorry Controller Status