summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uaccess' (batched user access infrastructure)Linus Torvalds2016-01-215-53/+155
|\
| * Use the new batched user accesses in generic user string handlingLinus Torvalds2015-12-172-7/+22
| * Add 'unsafe' user access functions for batched accessesLinus Torvalds2015-12-172-0/+32
| * x86: reorganize SMAP handling in user space accessesLinus Torvalds2015-12-172-46/+101
* | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2016-01-21203-3991/+3642
|\ \
| * | MAINTAINERS: add/fix git URLs for various subsystemsFengguang Wu2016-01-211-11/+42
| * | mm: memcontrol: add "sock" to cgroup2 memory.statJohannes Weiner2016-01-212-1/+10
| * | mm: memcontrol: basic memory statistics in cgroup2 memory controllerJohannes Weiner2016-01-212-0/+124
| * | mm: memcontrol: do not uncharge old page in page cache replacementJohannes Weiner2016-01-211-11/+15
| * | Documentation: cgroup: add memory.swap.{current,max} descriptionVladimir Davydov2016-01-211-0/+33
| * | mm: free swap cache aggressively if memcg swap is fullVladimir Davydov2016-01-215-3/+32
| * | mm: vmscan: do not scan anon pages if memcg swap limit is hitVladimir Davydov2016-01-213-1/+20
| * | swap.h: move memcg related stuff to the end of the fileVladimir Davydov2016-01-211-32/+38
| * | mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_onlineVladimir Davydov2016-01-212-18/+11
| * | mm: vmscan: pass memcg to get_scan_count()Vladimir Davydov2016-01-211-12/+8
| * | mm: memcontrol: charge swap to cgroup2Vladimir Davydov2016-01-216-10/+128
| * | mm: memcontrol: clean up alloc, online, offline, free functionsJohannes Weiner2016-01-212-176/+84
| * | mm: memcontrol: flatten struct cg_protoJohannes Weiner2016-01-212-26/+21
| * | mm: memcontrol: rein in the CONFIG space madnessJohannes Weiner2016-01-214-78/+12
| * | net: drop tcp_memcontrol.cVladimir Davydov2016-01-217-222/+90
| * | mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEMJohannes Weiner2016-01-215-13/+23
| * | mm: memcontrol: allow to disable kmem accounting for cgroup2Vladimir Davydov2016-01-212-2/+8
| * | mm: memcontrol: account "kmem" consumers in cgroup2 memory controllerJohannes Weiner2016-01-211-7/+11
| * | mm: memcontrol: move kmem accounting code to CONFIG_MEMCGJohannes Weiner2016-01-2111-57/+72
| * | mm: memcontrol: separate kmem code from legacy tcp accounting codeJohannes Weiner2016-01-211-21/+12
| * | mm: memcontrol: group kmem init and exit functions togetherJohannes Weiner2016-01-211-81/+76
| * | mm: memcontrol: give the kmem states more descriptive namesJohannes Weiner2016-01-214-35/+38
| * | mm: memcontrol: remove double kmem page_counter initJohannes Weiner2016-01-211-14/+10
| * | mm: memcontrol: drop unused @css argument in memcg_init_kmemJohannes Weiner2016-01-213-5/+6
| * | memstick: use sector_div instead of do_divArnd Bergmann2016-01-211-1/+1
| * | dma-mapping: use offset_in_page macroGeliang Tang2016-01-211-2/+2
| * | dma-mapping: remove <asm-generic/dma-coherent.h>Christoph Hellwig2016-01-214-42/+29
| * | dma-mapping: always provide the dma_map_ops based implementationChristoph Hellwig2016-01-2170-633/+369
| * | tile: uninline dma_set_maskChristoph Hellwig2016-01-212-28/+30
| * | sparc: use generic dma_set_maskChristoph Hellwig2016-01-211-15/+0
| * | metag: convert to dma_map_opsChristoph Hellwig2016-01-213-209/+117
| * | m68k: convert to dma_map_opsChristoph Hellwig2016-01-213-142/+32
| * | mn10300: convert to dma_map_opsChristoph Hellwig2016-01-213-163/+67
| * | parisc: convert to dma_map_opsChristoph Hellwig2016-01-216-270/+124
| * | frv: convert to dma_map_opsChristoph Hellwig2016-01-214-179/+101
| * | nios2: convert to dma_map_opsChristoph Hellwig2016-01-213-186/+87
| * | cris: convert to dma_map_opsChristoph Hellwig2016-01-213-165/+51
| * | c6x: convert to dma_map_opsChristoph Hellwig2016-01-214-147/+58
| * | blackfin: convert to dma_map_opsChristoph Hellwig2016-01-213-137/+43
| * | avr32: convert to dma_map_opsChristoph Hellwig2016-01-213-373/+85
| * | arc: convert to dma_map_opsChristoph Hellwig2016-01-213-230/+110
| * | dma-mapping: make the generic coherent dma mmap implementation optionalChristoph Hellwig2016-01-212-2/+5
| * | iio: core: fix ptr_ret.cocci warningsFengguang Wu2016-01-211-3/+1
| * | fs/adfs/adfs.h: tidy up commentsAndrew Morton2016-01-211-14/+14
| * | fs/overlayfs/super.c needs pagemap.hAndrew Morton2016-01-211-0/+1