From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751449AbdJDKJn convert rfc822-to-8bit (ORCPT <rfc822;w@1wt.eu>);
        Wed, 4 Oct 2017 06:09:43 -0400
Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:37403 "EHLO
        metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1751223AbdJDKJm (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 4 Oct 2017 06:09:42 -0400
Message-ID: <1507111778.11691.9.camel@pengutronix.de>
Subject: Re: [PATCH v2] ARC: reset: introduce AXS10x reset driver
From: Philipp Zabel <p.zabel@pengutronix.de>
To: Vineet Gupta <Vineet.Gupta1@synopsys.com>,
        Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Cc: linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>
Date: Wed, 04 Oct 2017 12:09:38 +0200
In-Reply-To: <1505753484.9807.18.camel@pengutronix.de>
References: <20170914142842.12225-1-Eugeniy.Paltsev@synopsys.com>
         <1505736441.9807.8.camel@pengutronix.de>
         <ce7885ab-b87e-ca07-234f-b63811afd86c@synopsys.com>
         <1505753484.9807.18.camel@pengutronix.de>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
X-Mailer: Evolution 3.22.6-1 
Mime-Version: 1.0
X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-kernel@vger.kernel.org
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Vineet,

On Mon, 2017-09-18 at 18:51 +0200, Philipp Zabel wrote:
> > Will it be OK for you to apply the corresponding DT update for
> > platform - that way 
> > I don't have to keep track of when ur branch hits mainline etc.
> > 
> > The chances of any ensuing conflicts are pretty rare - and easy to resolve if at all.
> > 
> > If so, Eugeniy can send the patch ur way !
> 
> Maybe it is better to do this the other way around? I can put this patch
> on a stable reset/arc branch for you to merge before applying the reset
> DT updates.

Have you come to a decision on this?

Just in case, I have removed the AXS10x driver from the reset/next
branch and put it on its own branch:

  git://git.pengutronix.de/git/pza/linux.git reset/arc

This branch is immutable and I'll merge it into reset/next before
submitting the branch for v4.15-rc1.

regards
Philipp