[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87y2qyi09k.fsf@gmail.com>
Date: Tue, 14 Apr 2020 16:56:39 +0200
From: Mathieu Othacehe <m.othacehe@...il.com>
To: Jonathan Cameron <jic23@...nel.org>
Cc: knaack.h@....de, lars@...afoo.de, pmeerw@...erw.net,
linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org,
Guido Günther <agx@...xcpu.org>
Subject: Re: [PATCH v2 4/4] iio: vcnl4000: Add buffer support for VCNL4010/20.
Hello Jonathan,
> One nitpick in here which I can fix whilst applying. The series as
> a whole looks good to me.
>
> On a more general note we probably have a merge conflict between this
> series and Guido's one adding the near level property to the driver.
>
> Based on a bit of arbitrary timing I'd like to apply Guido's first
> then try and take yours on top. If there are any problems I'll
> probably ask you to do the rebase at that point.
No problem :) There are indeed some conflicts to solve, I'll send an
updated revision when Guido's patch is integrated.
Thanks,
Mathieu
Powered by blists - more mailing lists