lkml.org 
[lkml]   [2016]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/1] iio: vcnl4000: Add IR current adjust support
From
Date
On 22/07/16 00:14, Peter Meerwald-Stadler wrote:
>
>>>>> comments below; nice addition
>>>>>
>>>>> it seems this patch clashes with the recent changes to this driver in
>>>>> iio-testing; can you rebase on top please?
>>>>
>>>> Where is iio-testing? I couldn't found it in linux.
>>>
>>> https://git.kernel.org/cgit/linux/kernel/git/jic23/iio.git/log/?h=testing
>>
>> Means we have to do development here and this testing branch will get
>> merged to main branch later.
>
> yes, Jonathan will queue up stuff in testing, then send to GregHK, and
> then to mainline
Testing is a special branch for the autobuilders. Except when I'm being
useless, the right branch to use is togreg as that 'never' rebases.

Jonathan
>
> p.
>

\
 
 \ /
  Last update: 2016-07-23 13:41    [W:0.101 / U:2.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site