Re: linux-next: manual merge of the tip tree with Linus' tree

From: Stephen Rothwell
Date: Wed Jan 29 2014 - 20:58:59 EST


Hi Andi,

On Wed, 29 Jan 2014 17:49:14 -0800 Andi Kleen <ak@xxxxxxxxxxxxxxx> wrote:
>
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> I don't think the fix is correct, both sysctls need to be kept. They
> do different things.

The tip tree commit 52bf84aa206c ("sched/numa,mm: Remove
p->numa_migrate_deferred") explicitly removed the
numa_balancing_migrate_deferred sysctl.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature