From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbcGWK5N (ORCPT ); Sat, 23 Jul 2016 06:57:13 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:53985 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbcGWK4A (ORCPT ); Sat, 23 Jul 2016 06:56:00 -0400 Subject: Re: [PATCH 1/1] iio: vcnl4000: Add IR current adjust support To: Peter Meerwald-Stadler , Pratik Prajapati References: <1468850968-19523-1-git-send-email-pratik.prajapati12@gmail.com> Cc: Hartmut Knaack , Lars-Peter Clausen , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org From: Jonathan Cameron Message-ID: <9d0f4395-b82f-5942-1e4c-29ba6ba84d16@kernel.org> Date: Sat, 23 Jul 2016 09:30:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. >