All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Jonathan Cameron <jic23@kernel.org>
Cc: Daniel Baluta <daniel.baluta@gmail.com>,
	"linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: [PULL] First round of new IIO drivers, features and cleanups for the 3.20 cycle
Date: Wed, 21 Jan 2015 04:30:44 +0800	[thread overview]
Message-ID: <20150120203044.GA11994@kroah.com> (raw)
In-Reply-To: <54BEBA73.5090709@kernel.org>

On Tue, Jan 20, 2015 at 08:28:35PM +0000, Jonathan Cameron wrote:
> On 09/01/15 09:46, Daniel Baluta wrote:
> > On Fri, Jan 9, 2015 at 9:43 AM, Daniel Baluta <daniel.baluta@gmail.com> wrote:
> >> On Fri, Jan 9, 2015 at 4:22 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
> >>> On Mon, Jan 05, 2015 at 08:21:09PM +0000, Jonathan Cameron wrote:
> >>>> The following changes since commit 5e62863aea463c9bf24538315327d0922be35d64:
> >>>>
> >>>>   staging: comedi: das800: use comedi_async 'scans_done' to detect EOA (2014-11-05 14:59:48 -0800)
> >>>>
> >>>> are available in the git repository at:
> >>>>
> >>>>   git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-3.20a
> >>>
> >>> This breaks the build for me:
> >>>
> >>> drivers/iio/imu/kmx61.c:1563:21: error: ‘kmx61_runtime_suspend’ undeclared here (not in a function)
> >>>   SET_RUNTIME_PM_OPS(kmx61_runtime_suspend, kmx61_runtime_resume, NULL)
> >>>                      ^
> >>> include/linux/pm.h:347:21: note: in definition of macro ‘SET_RUNTIME_PM_OPS’
> >>>   .runtime_suspend = suspend_fn, \
> >>>                      ^
> >>> drivers/iio/imu/kmx61.c:1563:44: error: ‘kmx61_runtime_resume’ undeclared here (not in a function)
> >>>   SET_RUNTIME_PM_OPS(kmx61_runtime_suspend, kmx61_runtime_resume, NULL)
> >>>                                             ^
> >>> include/linux/pm.h:348:20: note: in definition of macro ‘SET_RUNTIME_PM_OPS’
> >>>   .runtime_resume = resume_fn, \
> >>>                     ^
> >>>
> >>> So I don't want to pull it :(
> >>
> >> I will look into this.
> > 
> > OK. It's my fault :(. I've sent a patch to fix this.
> > 
> > Daniel.
> > 
> Hi Greg,
> 
> Just thought I'd check where we are with this. Are you still
> OK to take the series and handle the fixup patch in the merge?

Ah, I forgot about it, for some reason I was thinking you would just add
it to your tree.

Can you do so, I don't have that patch in my queue anywhere :(

thanks,

greg k-h

  reply	other threads:[~2015-01-20 21:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-05 20:21 [PULL] First round of new IIO drivers, features and cleanups for the 3.20 cycle Jonathan Cameron
2015-01-09  2:22 ` Greg KH
2015-01-09  7:43   ` Daniel Baluta
2015-01-09  9:46     ` Daniel Baluta
2015-01-20 20:28       ` Jonathan Cameron
2015-01-20 20:30         ` Greg KH [this message]
2015-01-20 21:57           ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150120203044.GA11994@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=daniel.baluta@gmail.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.