linux-next: some merging notes
flat view
From: benh@kernel.crashing.org (Benjamin Herrenschmidt)
Date: 2012-12-11 23:21:58
Also in:
linux-next, linuxppc-dev, lkml, netdev
On Wed, 2012-12-12 at 09:15 +1100, Stephen Rothwell wrote:
The powerpc tree (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) contains a commit that breaks the building of lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to linux-next to disable CONFIG_PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT.
I will put a fix in before I send the pull request. Cheers, Ben.