From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [GIT PULL] Immutable branch between MFD, GPIO and Regulator due for the v4.9 merge window Date: Mon, 12 Sep 2016 10:18:39 +0100 Message-ID: <20160912091839.GC1873@dell> References: <1472633892-8261-1-git-send-email-j-keerthy@ti.com> <20160831122435.GD9415@dell> <20160908072646.GH4921@dell> <20160909121140.GQ27946@sirena.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from mail-wm0-f53.google.com ([74.125.82.53]:36457 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757608AbcILJQn (ORCPT ); Mon, 12 Sep 2016 05:16:43 -0400 Received: by mail-wm0-f53.google.com with SMTP id b187so125178473wme.1 for ; Mon, 12 Sep 2016 02:16:43 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20160909121140.GQ27946@sirena.org.uk> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Mark Brown Cc: Linus Walleij , Keerthy , Linux-OMAP , Rob Herring , "linux-gpio@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" On Fri, 09 Sep 2016, Mark Brown wrote: > On Thu, Sep 08, 2016 at 08:26:46AM +0100, Lee Jones wrote: > > On Wed, 07 Sep 2016, Linus Walleij wrote: > > > > Hm it is based on a later release candidate than my tree so I'll wait > > > and see if I > > > have to pull it (like if there are clashes in linux-next...) > > > You use -rc1 as your base? Crazy man. :) > > I do that too for the topic branches. It's really helpful for cross > tree work as it avoids issues like the above - wherever it's being > merges it shouldn't pull in any extra dependencies so things are clearer > when reviewing diffs/logs and git has an easier time coping. I've always used -rc2 for everything. It's usually more stable for build-testing purposes. But I'll bow down, and try to use -rc1 in future, if it's preferred. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog