summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-10-0710-99/+146
|\
| *-----. Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-nextRoland Dreier2012-10-049-96/+143
| |\ \ \ \
| | | | | * RDMA/nes: Bump the version number of nes driverTatyana Nikolova2012-10-031-1/+1
| | | | | * RDMA/nes: Remove unused module parameter "send_first"Tatyana Nikolova2012-10-032-6/+0
| | | | | * RDMA/nes: Remove unnecessary if-else statementTatyana Nikolova2012-10-031-12/+3
| | | | | * RDMA/nes: Add missing break to switch.Tatyana Nikolova2012-10-031-0/+1
| | | | * | mlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFsJack Morgenstein2012-10-031-0/+2
| | | | |/
| | | * | IB/iser: Add more RX CQs to scale out processing of SCSI responsesAlex Tabachnik2012-10-032-44/+103
| | | |/
| | * | IPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=nRoland Dreier2012-10-023-33/+33
| | |/
| * | RDMA/cma: Check that retry count values are in rangeSean Hefty2012-10-041-3/+3
| |/
* | Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headersLinus Torvalds2012-10-0715-66/+15
|\ \
| * | UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)David Howells2012-10-041-6/+3
| * | Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prepDavid Howells2012-10-043-17/+3
| |\ \
| | * | c6x: remove c6x signal.hMark Salter2012-10-042-17/+1
| | * | c6x: make dsk6455 the default configMark Salter2012-10-031-0/+2
| * | | UAPI: Split compound conditionals containing __KERNEL__ in Arm64David Howells2012-10-043-3/+9
| * | | UAPI: Fix the guards on various asm/unistd.h filesDavid Howells2012-10-049-40/+0
* | | | Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-10-079-436/+463
|\ \ \ \
| * \ \ \ Merge branch 'slab/tracing' into slab/for-linusPekka Enberg2012-10-033-9/+9
| |\ \ \ \
| | * | | | mm/slab: Fix kmem_cache_alloc_node_trace() declarationEzequiel Garcia2012-09-291-7/+7
| | * | | | Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"Pekka Enberg2012-09-291-4/+4
| | * | | | mm, slob: fix build breakage in __kmalloc_node_track_callerDavid Rientjes2012-09-261-1/+1
| | * | | | mm/slab: Fix kmem_cache_alloc_node_trace() declarationEzequiel Garcia2012-09-251-4/+4
| | * | | | mm/slab: Fix typo _RET_IP -> _RET_IP_Ezequiel Garcia2012-09-251-1/+1
| * | | | | Merge branch 'slab/common-for-cgroups' into slab/for-linusPekka Enberg2012-10-035-277/+280
| |\ \ \ \ \
| | * | | | | slab: Only define slab_error for DEBUGChristoph Lameter2012-09-191-0/+2
| | * | | | | slub: Zero initial memory segment for kmem_cache and kmem_cache_nodeChristoph Lameter2012-09-101-1/+1
| | * | | | | Revert "mm/sl[aou]b: Move sysfs_slab_add to common"Pekka Enberg2012-09-053-13/+17
| | * | | | | mm/sl[aou]b: Move kmem_cache refcounting to common codeChristoph Lameter2012-09-054-5/+3
| | * | | | | mm/sl[aou]b: Shrink __kmem_cache_create() parameter listsChristoph Lameter2012-09-055-81/+68
| | * | | | | mm/sl[aou]b: Move kmem_cache allocations into common codeChristoph Lameter2012-09-055-70/+52
| | * | | | | mm/sl[aou]b: Move sysfs_slab_add to commonChristoph Lameter2012-09-053-13/+13
| | * | | | | mm/sl[aou]b: Do slab aliasing call from common codeChristoph Lameter2012-09-053-4/+25
| | * | | | | mm/sl[aou]b: Move duping of slab name to slab_common.cChristoph Lameter2012-09-052-28/+23
| | * | | | | mm/sl[aou]b: Get rid of __kmem_cache_destroyChristoph Lameter2012-09-055-36/+26
| | * | | | | mm/sl[aou]b: Move freeing of kmem_cache structure to common codeChristoph Lameter2012-09-054-5/+1
| | * | | | | mm/sl[aou]b: Use "kmem_cache" name for slab cache with kmem_cache structChristoph Lameter2012-09-055-37/+52
| | * | | | | mm/sl[aou]b: Extract a common function for kmem_cache_destroyChristoph Lameter2012-09-055-75/+49
| | * | | | | mm/sl[aou]b: Move list_add() to slab_common.cChristoph Lameter2012-09-054-4/+16
| | * | | | | mm/slab_common: Improve error handling in kmem_cache_createChristoph Lameter2012-09-051-4/+24
| | * | | | | mm/slub: Use kmem_cache for the kmem_cache structureChristoph Lameter2012-09-051-4/+4
| | * | | | | mm/slub: Add debugging to verify correct cache use on kmem_cache_free()Christoph Lameter2012-09-051-0/+7
| * | | | | | Merge branch 'slab/next' into slab/for-linusPekka Enberg2012-10-038-162/+186
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | slab: Fix build failure in __kmem_cache_create()Tetsuo Handa2012-10-031-2/+3
| | * | | | | slub: init_kmem_cache_cpus() and put_cpu_partial() can be staticFengguang Wu2012-10-031-2/+2
| | | |/ / / | | |/| | |
| | * | | | mm, slub: Rename slab_alloc() -> slab_alloc_node() to match SLABEzequiel Garcia2012-09-251-9/+15
| | * | | | mm, slab: Rename __cache_alloc() -> slab_alloc()Ezequiel Garcia2012-09-251-7/+7
| | * | | | mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototypeEzequiel Garcia2012-09-252-9/+8
| | * | | | mm, slab: Replace 'caller' type, void* -> unsigned longEzequiel Garcia2012-09-251-26/+24
| | * | | | mm, slob: Add support for kmalloc_track_caller()Ezequiel Garcia2012-09-252-5/+28
OpenPOWER on IntegriCloud