From: Jonathan Cameron <jic23@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: [PULL v2] Second set of new drivers, functionality and cleanup for IIO in the 4.3 cycle (+ some fixes)
Date: Wed, 12 Aug 2015 22:08:03 +0100 [thread overview]
Message-ID: <55CBB5B3.1050307@kernel.org> (raw)
In-Reply-To: <20150812194508.GA4279@kroah.com>
On 12/08/15 20:45, Greg KH wrote:
> On Wed, Aug 12, 2015 at 08:28:02PM +0100, Jonathan Cameron wrote:
>> The following changes since commit b8d1f261fe7e4967593a5637d62991b6197a03f8:
>>
>> staging: dgap: remove duplicate code (2015-07-16 10:19:55 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-4.3b-2
>
> I had to do a merge conflict resolution in one driver, it was pretty
> trivial, but if you could check I got it right, that would be great.
>
> thanks,
>
> greg k-h
I guess that would be the mlx90614.c (mentioned in the reply to the previous
pull request so knew that one was coming!)
Looks fine to me.
Thanks
Jonathan
next prev parent reply other threads:[~2015-08-12 21:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-12 19:28 [PULL v2] Second set of new drivers, functionality and cleanup for IIO in the 4.3 cycle (+ some fixes) Jonathan Cameron
2015-08-12 19:45 ` Greg KH
2015-08-12 21:08 ` Jonathan Cameron [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-12 18:35 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=55CBB5B3.1050307@kernel.org \
--to=jic23@kernel.org \
--cc=gregkh@linuxfoundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).