Subject: Re: linux-next: build failure after merge of the final tree (driver-core tree related)

From: "Rafael J. Wysocki" <[email-masked]>
Date: Tue, 10 May 2011 00:19:52 +0200

On Monday, May 09, 2011, Kay Sievers wrote:
> On Mon, May 9, 2011 at 06:58, Stephen Rothwell <[email-masked]> wrote:
> > After merging the final tree, today's linux-next build (powerpc allnoconfig)
> > failed like this:
> >
> > kernel/sys.c: In function 'kernel_restart_prepare':
> > kernel/sys.c:317: error: implicit declaration of function 'usermodehelper_disable'
> 
> Rafael, seems usermodehelper_disable() depends on CONFIG_PM_SLEEP.
> 
> Any reason for that conditional? Remove it now?

Aw, we have two conflicting changes.  Could you prepare a patch on top of:

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git pm-next

removing that #ifdef?  That needs to be done in kmod.h too.

Thanks,
Rafael