All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Jonathan Cameron <jic23@kernel.org>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: [PULL] Second set of new device, new features and cleanups for IIO in the 4.8 cycle
Date: Wed, 29 Jun 2016 15:35:40 -0700	[thread overview]
Message-ID: <20160629223540.GA20281@kroah.com> (raw)
In-Reply-To: <071b2c5d-5de4-48cf-81a8-b943084dce09@kernel.org>

On Wed, Jun 29, 2016 at 07:54:54PM +0100, Jonathan Cameron wrote:
> Hi Greg,
> 
> A few merge conflicts on this.  Two are the obvious choice.
> The third is in industrialio-trigger.c and you want the version that
> doesn't check for trig->ops (as it is no longer considered optional so
> must exist by that point).

Odd, I only had a conflict in a Kconfig and the .mailmap file.  Can you
check that I got this all right?

thanks,

greg k-h

  reply	other threads:[~2016-06-29 22:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 17:32 [PULL] Second set of new device, new features and cleanups for IIO in the 4.8 cycle Jonathan Cameron
2016-06-29 18:54 ` Jonathan Cameron
2016-06-29 22:35   ` Greg KH [this message]
2016-06-30 19:16     ` 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=20160629223540.GA20281@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --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.