From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:48597 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753135AbbAOVBq (ORCPT ); Thu, 15 Jan 2015 16:01:46 -0500 Message-ID: <54B82AB5.8040700@kernel.org> Date: Thu, 15 Jan 2015 21:01:41 +0000 From: Jonathan Cameron MIME-Version: 1.0 To: Greg KH CC: Daniel Baluta , linux-iio@vger.kernel.org, rafael.j.wysocki@intel.com Subject: Re: [PATCH] iio kmx61 / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM References: <1420796370-12158-1-git-send-email-daniel.baluta@intel.com> <54B0FFDB.1020402@kernel.org> <20150110173014.GA7488@kroah.com> In-Reply-To: <20150110173014.GA7488@kroah.com> Content-Type: text/plain; charset=windows-1252 Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 10/01/15 17:30, Greg KH wrote: > On Sat, Jan 10, 2015 at 10:32:59AM +0000, Jonathan Cameron wrote: >> On 09/01/15 09:39, Daniel Baluta wrote: >>> After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is >>> selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks >>> depending on CONFIG_PM_RUNTIME may now be changed to depend on >>> CONFIG_PM. >>> >>> Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under >>> drivers/iio/imu/kmx61.c >>> >>> Signed-off-by: Daniel Baluta >> Thanks Daniel, glad you tracked this down. I was wondering why >> the autobuilders were happy but it broke for Greg! (short memory >> sometimes, given that patch was only a month ago). >> >> Greg, as my tree is currently behind the point where Rafael did the big >> patch series to fix this (and hence doesn't have the precursor patch) >> there are two obvious solutions - either I rebase, or you take >> this one patch directly as a merge fix. >> >> Which would you prefer? > > I can take this one on top of your tree if you ack it, that sould solve > the issue. Cool - I acked a few days ago. Hope that is fine. Thanks, Jonathan > thanks, > > greg k-h > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >