From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v6 0/4] Introduce MEN 14F021P00 BMC driver series Date: Thu, 25 Sep 2014 08:42:34 +0100 Message-ID: <20140925074234.GD7113@lee--X1> References: <20140924144829.GK32069@lee--X1> <20140924154503.GA12403@roeck-us.net> <20140924161837.GA7113@lee--X1> <20140924165739.GA31578@roeck-us.net> <20140924184143.GC7113@lee--X1> <20140925082611.GA967@awelinux> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <20140925082611.GA967@awelinux> Sender: linux-kernel-owner@vger.kernel.org To: Andreas Werner Cc: Guenter Roeck , Bryan Wu , lkml , Samuel Ortiz , lm-sensors@lm-sensors.org, wim@iguana.be, linux-watchdog@vger.kernel.org, "rpurdie@rpsys.net" , Linux LED Subsystem List-Id: linux-leds@vger.kernel.org On Thu, 25 Sep 2014, Andreas Werner wrote: > On Wed, Sep 24, 2014 at 07:41:43PM +0100, Lee Jones wrote: > > On Wed, 24 Sep 2014, Guenter Roeck wrote: > >=20 > > > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > > > > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones wrote: > > > > > On Wed, 24 Sep 2014, Guenter Roeck wrote: > > > > > > > > > >> On Wed, Sep 24, 2014 at 03:48:29PM +0100, Lee Jones wrote: > > > > >> > Guenter, Bryan, Wim, > > > > >> > > > > > >> > The following changes since commit 52addcf9d6669fa43938761= 0bc65c92fa0980cef: > > > > >> > > > > > >> > Linux 3.17-rc2 (2014-08-25 15:36:20 -0700) > > > > >> > > > > > >> > are available in the git repository at: > > > > >> > > > > > >> > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.gi= t tags/mfd-hwmon-leds-watchdog-v3.18 > > > > >> > > > > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9= f0a0fbe47656a: > > > > >> > > > > > >> > hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driv= er (2014-09-24 15:36:33 +0100) > > > > >> > > > > > >> > ----------------------------------------------------------= ------ > > > > >> > Immutable branch between MFD, HWMON, LEDs and Watchdog for= v3.18 > > > > >> > > > > > >> I assume you'll push it all through mfd, correct ? > > > > > > > > > > The idea is for all the affected Maintainers to pull this bra= nch in to > > > > > their own trees. If you guys don't, there will be a good cha= nce of > > > > > conflict during the merge-window, which will subsequently ups= et Linus. > > > > > > > > > > So in answer to your question; yes I'll be taking this, but s= o should > > > > > each of you. > > > > > > > > >=20 > > > > Thanks for this, man. What am I going to do here? Need I pull i= n all > > > > the patches here into my LED tree or just one LED patch? I thin= k if > > > > you push this for Linus through MFD tree, I don't need to pull = it into > > > > my tree, right? > > > >=20 > > > I did > > >=20 > > > git remote add mfd git://git.kernel.org/pub/scm/linux/kernel/git/= lee/mfd.git > > > git fetch --tags mfd > > > git merge mfd-hwmon-leds-watchdog-v3.18 > > >=20 > > > in both my hwmon-next and watchdog-next branches. Both are curren= tly building, > > > and already pushed into to my repository at kernel.org. > > >=20 > > > So, effectively, when I send my pull request to Linus, all patche= s from > > > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire ser= ies. > > > The same will happen when Lee sends his pull request, and Wim, an= d you.=20 > > > I believe that is what Lee is asking for. > >=20 > > That's right. It's not okay to break this branch up. If it was, w= e > > would have been able to apply our respective components into our ow= n > > trees from the beginning, but as there are interdependencies, break= ing > > up the branch could have nasty consequences depending on the order = in > > which they land in Mainline. Most likely bisectability will be > > broken, which is not allowed. > >=20 >=20 > Hi, > please do not forget the MAINTAINERS Patch for this series. > I have send it last week attached to this series. I'll take this through the MFD tree with everyone's Ack. --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ig0-f176.google.com ([209.85.213.176]:34121 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752593AbaIYHmq (ORCPT ); Thu, 25 Sep 2014 03:42:46 -0400 Received: by mail-ig0-f176.google.com with SMTP id hn15so8000866igb.15 for ; Thu, 25 Sep 2014 00:42:44 -0700 (PDT) Date: Thu, 25 Sep 2014 08:42:34 +0100 From: Lee Jones To: Andreas Werner Cc: Guenter Roeck , Bryan Wu , lkml , Samuel Ortiz , lm-sensors@lm-sensors.org, wim@iguana.be, linux-watchdog@vger.kernel.org, "rpurdie@rpsys.net" , Linux LED Subsystem Subject: Re: [PATCH v6 0/4] Introduce MEN 14F021P00 BMC driver series Message-ID: <20140925074234.GD7113@lee--X1> References: <20140924144829.GK32069@lee--X1> <20140924154503.GA12403@roeck-us.net> <20140924161837.GA7113@lee--X1> <20140924165739.GA31578@roeck-us.net> <20140924184143.GC7113@lee--X1> <20140925082611.GA967@awelinux> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: QUOTED-PRINTABLE In-Reply-To: <20140925082611.GA967@awelinux> Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On Thu, 25 Sep 2014, Andreas Werner wrote: > On Wed, Sep 24, 2014 at 07:41:43PM +0100, Lee Jones wrote: > > On Wed, 24 Sep 2014, Guenter Roeck wrote: > >=20 > > > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > > > > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones wrote: > > > > > On Wed, 24 Sep 2014, Guenter Roeck wrote: > > > > > > > > > >> On Wed, Sep 24, 2014 at 03:48:29PM +0100, Lee Jones wrote: > > > > >> > Guenter, Bryan, Wim, > > > > >> > > > > > >> > The following changes since commit 52addcf9d6669fa43938761= 0bc65c92fa0980cef: > > > > >> > > > > > >> > Linux 3.17-rc2 (2014-08-25 15:36:20 -0700) > > > > >> > > > > > >> > are available in the git repository at: > > > > >> > > > > > >> > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.gi= t tags/mfd-hwmon-leds-watchdog-v3.18 > > > > >> > > > > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9= f0a0fbe47656a: > > > > >> > > > > > >> > hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driv= er (2014-09-24 15:36:33 +0100) > > > > >> > > > > > >> > ----------------------------------------------------------= ------ > > > > >> > Immutable branch between MFD, HWMON, LEDs and Watchdog for= v3.18 > > > > >> > > > > > >> I assume you'll push it all through mfd, correct ? > > > > > > > > > > The idea is for all the affected Maintainers to pull this bra= nch in to > > > > > their own trees. If you guys don't, there will be a good cha= nce of > > > > > conflict during the merge-window, which will subsequently ups= et Linus. > > > > > > > > > > So in answer to your question; yes I'll be taking this, but s= o should > > > > > each of you. > > > > > > > > >=20 > > > > Thanks for this, man. What am I going to do here? Need I pull i= n all > > > > the patches here into my LED tree or just one LED patch? I thin= k if > > > > you push this for Linus through MFD tree, I don't need to pull = it into > > > > my tree, right? > > > >=20 > > > I did > > >=20 > > > git remote add mfd git://git.kernel.org/pub/scm/linux/kernel/git/= lee/mfd.git > > > git fetch --tags mfd > > > git merge mfd-hwmon-leds-watchdog-v3.18 > > >=20 > > > in both my hwmon-next and watchdog-next branches. Both are curren= tly building, > > > and already pushed into to my repository at kernel.org. > > >=20 > > > So, effectively, when I send my pull request to Linus, all patche= s from > > > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire ser= ies. > > > The same will happen when Lee sends his pull request, and Wim, an= d you.=20 > > > I believe that is what Lee is asking for. > >=20 > > That's right. It's not okay to break this branch up. If it was, w= e > > would have been able to apply our respective components into our ow= n > > trees from the beginning, but as there are interdependencies, break= ing > > up the branch could have nasty consequences depending on the order = in > > which they land in Mainline. Most likely bisectability will be > > broken, which is not allowed. > >=20 >=20 > Hi, > please do not forget the MAINTAINERS Patch for this series. > I have send it last week attached to this series. I'll take this through the MFD tree with everyone's Ack. --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-watchdo= g" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html