diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-09 15:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-09 15:59:24 -0400 |
| commit | e800072c18f0d7b89a80fa46dceb3d080c80e09c (patch) | |
| tree | 8da6cb7944762a60ec37594720c1ad2757631c2f /mm/page_alloc.c | |
| parent | e8ed77dfa90dd79c5343415a4bbbfdab9787b35a (diff) | |
| parent | b507146bb6b9ac0c0197100ba3e299825a21fed3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
In netdevice.h we removed the structure in net-next that is being
changes in 'net'. In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.
The mlx5 conflicts have to do with vxlan support dependencies.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 59de90d5d3a3..c1069efcc4d7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -6485,7 +6485,7 @@ int __meminit init_per_zone_wmark_min(void) | |||
| 6485 | setup_per_zone_inactive_ratio(); | 6485 | setup_per_zone_inactive_ratio(); |
| 6486 | return 0; | 6486 | return 0; |
| 6487 | } | 6487 | } |
| 6488 | module_init(init_per_zone_wmark_min) | 6488 | core_initcall(init_per_zone_wmark_min) |
| 6489 | 6489 | ||
| 6490 | /* | 6490 | /* |
| 6491 | * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so | 6491 | * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so |