[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9d0f4395-b82f-5942-1e4c-29ba6ba84d16@kernel.org>
Date: Sat, 23 Jul 2016 09:30:14 +0200
From: Jonathan Cameron <jic23@...nel.org>
To: Peter Meerwald-Stadler <pmeerw@...erw.net>,
Pratik Prajapati <pratik.prajapati12@...il.com>
Cc: Hartmut Knaack <knaack.h@....de>,
Lars-Peter Clausen <lars@...afoo.de>,
linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] iio: vcnl4000: Add IR current adjust support
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.
>
Powered by blists - more mailing lists