From: Jonathan Cameron <jic23@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>,
Irina Tirdea <irina.tirdea@intel.com>
Subject: Re: [PULL] First round of new device support, features and cleanups for IIO in the 4.7 cycle.
Date: Sun, 17 Apr 2016 12:56:25 +0100 [thread overview]
Message-ID: <571379E9.2020307@kernel.org> (raw)
In-Reply-To: <20160411165657.GA27572@kroah.com>
On 11/04/16 17:56, Greg KH wrote:
> On Sun, Apr 03, 2016 at 10:31:39PM +0100, Jonathan Cameron wrote:
>> Hi Greg,
>>
>> Note there is a merge conflict with one of the patches in the second lot of fixes
>> I sent early today. This is because the change got queued up here first then
>> we noticed and issue which it fixed by accident.
>>
>> Anyhow, conflict is in bmg160-core.c and you want the 'short option'.
>> For comparison, the code is pretty much identical to bmc150-accel-core.c.
>>
>> Otherwise, various automerged corners that seem to be fine. My build tests
>> failed on a random thermal driver which I'll assume has long since been fixed,
>> but otherwise seemed fine.
>
> I've done the merge now, can you verify I got it correct?
>
Sorry for slow reply - looks good as it matches what I have locally.
Thanks,
Jonathan
> thanks,
>
> greg k-h
>
next prev parent reply other threads:[~2016-04-17 11:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-03 21:27 [PULL] First round of new device support, features and cleanups for IIO in the 4.7 cycle Jonathan Cameron
2016-04-03 21:31 ` Jonathan Cameron
2016-04-11 16:56 ` Greg KH
2016-04-17 11:56 ` Jonathan Cameron [this message]
2016-04-04 19:40 ` Greg KH
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=571379E9.2020307@kernel.org \
--to=jic23@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=irina.tirdea@intel.com \
--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.