From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bryan Wu Subject: Re: [PATCH v6 0/4] Introduce MEN 14F021P00 BMC driver series Date: Wed, 24 Sep 2014 09:33:32 -0700 Message-ID: References: <20140924144829.GK32069@lee--X1> <20140924154503.GA12403@roeck-us.net> <20140924161837.GA7113@lee--X1> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20140924161837.GA7113@lee--X1> Sender: linux-kernel-owner@vger.kernel.org To: Lee Jones Cc: Guenter Roeck , Andreas Werner , 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 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 52addcf9d6669fa439387610bc65c92= fa0980cef: >> > >> > 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.git tags/m= fd-hwmon-leds-watchdog-v3.18 >> > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe4= 7656a: >> > >> > hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver (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 branch in t= o > their own trees. If you guys don't, there will be a good chance of > conflict during the merge-window, which will subsequently upset Linus= =2E > > So in answer to your question; yes I'll be taking this, but so should > each of you. > Thanks for this, man. What am I going to do here? Need I pull in all the patches here into my LED tree or just one LED patch? I think if you push this for Linus through MFD tree, I don't need to pull it into my tree, right? I was confused, sorry. -Bryan >> > ---------------------------------------------------------------- >> > Andreas Werner (4): >> > mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver >> > watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdo= g driver >> > leds: leds-menf21bmc: Introduce MEN 14F021P00 BMC LED driver >> > hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver >> > >> > Documentation/hwmon/menf21bmc | 50 +++++++++ >> > drivers/hwmon/Kconfig | 10 ++ >> > drivers/hwmon/Makefile | 1 + >> > drivers/hwmon/menf21bmc_hwmon.c | 230 ++++++++++++++++++++++++++= +++++++++++++ >> > drivers/leds/Kconfig | 9 ++ >> > drivers/leds/Makefile | 1 + >> > drivers/leds/leds-menf21bmc.c | 131 ++++++++++++++++++++++ >> > drivers/mfd/Kconfig | 15 +++ >> > drivers/mfd/Makefile | 1 + >> > drivers/mfd/menf21bmc.c | 132 ++++++++++++++++++++++ >> > drivers/watchdog/Kconfig | 10 ++ >> > drivers/watchdog/Makefile | 1 + >> > drivers/watchdog/menf21bmc_wdt.c | 203 ++++++++++++++++++++++++++= ++++++++ >> > 13 files changed, 794 insertions(+) >> > create mode 100644 Documentation/hwmon/menf21bmc >> > create mode 100644 drivers/hwmon/menf21bmc_hwmon.c >> > create mode 100644 drivers/leds/leds-menf21bmc.c >> > create mode 100644 drivers/mfd/menf21bmc.c >> > create mode 100644 drivers/watchdog/menf21bmc_wdt.c >> > > > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org =E2=94=82 Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lb0-f171.google.com ([209.85.217.171]:42479 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753161AbaIXQdy convert rfc822-to-8bit (ORCPT ); Wed, 24 Sep 2014 12:33:54 -0400 MIME-Version: 1.0 In-Reply-To: <20140924161837.GA7113@lee--X1> References: <20140924144829.GK32069@lee--X1> <20140924154503.GA12403@roeck-us.net> <20140924161837.GA7113@lee--X1> From: Bryan Wu Date: Wed, 24 Sep 2014 09:33:32 -0700 Message-ID: Subject: Re: [PATCH v6 0/4] Introduce MEN 14F021P00 BMC driver series To: Lee Jones Cc: Guenter Roeck , Andreas Werner , lkml , Samuel Ortiz , lm-sensors@lm-sensors.org, wim@iguana.be, linux-watchdog@vger.kernel.org, "rpurdie@rpsys.net" , Linux LED Subsystem Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org 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 52addcf9d6669fa439387610bc65c92= fa0980cef: >> > >> > 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.git tags/m= fd-hwmon-leds-watchdog-v3.18 >> > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe4= 7656a: >> > >> > hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver (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 branch in t= o > their own trees. If you guys don't, there will be a good chance of > conflict during the merge-window, which will subsequently upset Linus= =2E > > So in answer to your question; yes I'll be taking this, but so should > each of you. > Thanks for this, man. What am I going to do here? Need I pull in all the patches here into my LED tree or just one LED patch? I think if you push this for Linus through MFD tree, I don't need to pull it into my tree, right? I was confused, sorry. -Bryan >> > ---------------------------------------------------------------- >> > Andreas Werner (4): >> > mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver >> > watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdo= g driver >> > leds: leds-menf21bmc: Introduce MEN 14F021P00 BMC LED driver >> > hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver >> > >> > Documentation/hwmon/menf21bmc | 50 +++++++++ >> > drivers/hwmon/Kconfig | 10 ++ >> > drivers/hwmon/Makefile | 1 + >> > drivers/hwmon/menf21bmc_hwmon.c | 230 ++++++++++++++++++++++++++= +++++++++++++ >> > drivers/leds/Kconfig | 9 ++ >> > drivers/leds/Makefile | 1 + >> > drivers/leds/leds-menf21bmc.c | 131 ++++++++++++++++++++++ >> > drivers/mfd/Kconfig | 15 +++ >> > drivers/mfd/Makefile | 1 + >> > drivers/mfd/menf21bmc.c | 132 ++++++++++++++++++++++ >> > drivers/watchdog/Kconfig | 10 ++ >> > drivers/watchdog/Makefile | 1 + >> > drivers/watchdog/menf21bmc_wdt.c | 203 ++++++++++++++++++++++++++= ++++++++ >> > 13 files changed, 794 insertions(+) >> > create mode 100644 Documentation/hwmon/menf21bmc >> > create mode 100644 drivers/hwmon/menf21bmc_hwmon.c >> > create mode 100644 drivers/leds/leds-menf21bmc.c >> > create mode 100644 drivers/mfd/menf21bmc.c >> > create mode 100644 drivers/watchdog/menf21bmc_wdt.c >> > > > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org =E2=94=82 Open source software for ARM SoCs > Follow 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