Messages in this thread | | | Date | Thu, 30 Jan 2014 12:42:01 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in kernel/sysctl.c between commit 54a43d54988a ("numa: add a sysctl for numa_balancing") from Linus' tree and commit 52bf84aa206c ("sched/numa, mm: Remove p->numa_migrate_deferred") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/sysctl.c index 096db7452cbd,2a4a4fc89cd1..000000000000 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@@ -383,22 -386,6 +385,15 @@@ static struct ctl_table kern_table[] = .mode = 0644, .proc_handler = proc_dointvec, }, + { - .procname = "numa_balancing_migrate_deferred", - .data = &sysctl_numa_balancing_migrate_deferred, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { + .procname = "numa_balancing", + .data = NULL, /* filled in by handler */ + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = sysctl_numa_balancing, + .extra1 = &zero, + .extra2 = &one, + }, #endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_SCHED_DEBUG */ { [unhandled content-type:application/pgp-signature] | |