Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752023AbdFKVwc (ORCPT ); Sun, 11 Jun 2017 17:52:32 -0400 Received: from mail-io0-f169.google.com ([209.85.223.169]:33145 "EHLO mail-io0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbdFKVwa (ORCPT ); Sun, 11 Jun 2017 17:52:30 -0400 MIME-Version: 1.0 In-Reply-To: <878tl1pot6.fsf@free-electrons.com> References: <2d89fbc10d07c890336eabbd362e55cb2e5055b5.1496413293.git-series.gregory.clement@free-electrons.com> <878tl1pot6.fsf@free-electrons.com> From: Linus Walleij Date: Sun, 11 Jun 2017 23:52:28 +0200 Message-ID: Subject: Re: [PATCH v2 01/11] pinctrl: dt-bindings: add documentation for AP806 pin controllers To: Gregory CLEMENT Cc: "linux-gpio@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , "linux-arm-kernel@lists.infradead.org" , Rob Herring , "devicetree@vger.kernel.org" , Russell King , Nadav Haklai , Kostya Porotchkin , Neta Zur Hershkovits , Marcin Wojtas , Omri Itach , Shadi Ammouri Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2071 Lines: 51 On Fri, Jun 9, 2017 at 10:07 AM, Gregory CLEMENT wrote: > As I wrote in the cover letter : > "The patch modifying the documentation still depend on the ones of the > clk series. For the ap806 a first stable branch is already available: > https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806" Sorry I may miss things like that... usually it is better if patches that depend on each other for merging are in the same series. > In the previous version of the series the clk maintainer said they will > provide stable branch for the documentation. For ap806 it is already > done, but not yet for cp110. But if you still have problem with it Rob > offer to take care of the devie tree documentation. > > Just let us know what you prefer. I don't understand. Tell me what I need to do or we can just wait a kernel cycle before merging this I guess. Either I need an immutable branch or I merge the clock patches I guess. Neither is very good but I'm open to compromises. >> I hope for the love of god that this does not also clash with the >> PWM stuff that is patching around in the GPIO tree, if it does >> I might very well throw up my hands and defer merging all of >> this until the next kernel cycle past v4.13-rc1. > > To avoid this kind of issues the series are based on next-20170531 in > order to have in the same time the devel branch of the linux-gpio tree > and the devel branch of the linux-pinctrl tree. I see. Well if nothing else works, we just defer. > I use the linux-next tree because you already picked up some patches of > my first series and applied it on your devel branches. If I rebased on > v4;12-rc2, obviously it won't work. So really basing the series on your > devel branch is the best thing to do. Indeed, sorry, the left hand doesn't know what the right hand is doing sometimes. > I saw that you already applied the PWM patch so as soon as they were > visible on the devel branches I will rebased the series on it and submit > it a new version. OK Yours, Linus Walleij