| Message ID | 20140924144829.GK32069@lee--X1 |
|---|---|
| State | New |
| Headers | show |
On Wed, Sep 24, 2014 at 03:48:29PM +0100, Lee Jones wrote: > Guenter, Bryan, Wim, > > The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef: > > 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/mfd-hwmon-leds-watchdog-v3.18 > > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > 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 ? Thanks, Guenter > ---------------------------------------------------------------- > Andreas Werner (4): > mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver > watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog 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 │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-leds" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 52addcf9d6669fa439387610bc65c92fa0980cef: > > > > 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/mfd-hwmon-leds-watchdog-v3.18 > > > > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > > > 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 to 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. So in answer to your question; yes I'll be taking this, but so should each of you. > > ---------------------------------------------------------------- > > Andreas Werner (4): > > mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver > > watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog 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 > >
On Wed, Sep 24, 2014 at 05:18:37PM +0100, 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 52addcf9d6669fa439387610bc65c92fa0980cef: > > > > > > 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/mfd-hwmon-leds-watchdog-v3.18 > > > > > > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > > > > > 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 to > 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. > > So in answer to your question; yes I'll be taking this, but so should > each of you. > No problem with me. Let's see how it goes. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: >> > >> > 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/mfd-hwmon-leds-watchdog-v3.18 >> > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: >> > >> > 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 to > 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. > > 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 Watchdog 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 │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: > >> > > >> > 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/mfd-hwmon-leds-watchdog-v3.18 > >> > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > >> > > >> > 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 to > > 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. > > > > 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 did 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 in both my hwmon-next and watchdog-next branches. Both are currently building, and already pushed into to my repository at kernel.org. So, effectively, when I send my pull request to Linus, all patches from mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire series. The same will happen when Lee sends his pull request, and Wim, and you. I believe that is what Lee is asking for. Thanks, Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 24, 2014 at 9:57 AM, Guenter Roeck <linux@roeck-us.net> wrote: > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: >> On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: >> >> > >> >> > 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/mfd-hwmon-leds-watchdog-v3.18 >> >> > >> >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: >> >> > >> >> > 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 to >> > 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. >> > >> > 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 did > > 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 > > in both my hwmon-next and watchdog-next branches. Both are currently building, > and already pushed into to my repository at kernel.org. > > So, effectively, when I send my pull request to Linus, all patches from > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire series. > The same will happen when Lee sends his pull request, and Wim, and you. > I believe that is what Lee is asking for. > Great, thanks a lot. I just did the same thing for my leds tree. -Bryan -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 24 Sep 2014, Guenter Roeck wrote: > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: > > >> > > > >> > 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/mfd-hwmon-leds-watchdog-v3.18 > > >> > > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > >> > > > >> > 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 to > > > 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. > > > > > > 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 did > > 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 > > in both my hwmon-next and watchdog-next branches. Both are currently building, > and already pushed into to my repository at kernel.org. > > So, effectively, when I send my pull request to Linus, all patches from > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire series. > The same will happen when Lee sends his pull request, and Wim, and you. > I believe that is what Lee is asking for. That's right. It's not okay to break this branch up. If it was, we would have been able to apply our respective components into our own trees from the beginning, but as there are interdependencies, breaking 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.
Hi All, > On Wed, 24 Sep 2014, Guenter Roeck wrote: > > > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > > > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: > > > >> > > > > >> > 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/mfd-hwmon-leds-watchdog-v3.18 > > > >> > > > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > > >> > > > > >> > 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 to > > > > 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. > > > > > > > > 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 did > > > > 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 > > > > in both my hwmon-next and watchdog-next branches. Both are currently building, > > and already pushed into to my repository at kernel.org. > > > > So, effectively, when I send my pull request to Linus, all patches from > > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire series. > > The same will happen when Lee sends his pull request, and Wim, and you. > > I believe that is what Lee is asking for. > > That's right. It's not okay to break this branch up. If it was, we > would have been able to apply our respective components into our own > trees from the beginning, but as there are interdependencies, breaking > 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. Added to linux-watchdog-next. Kind regards, Wim. -- To unsubscribe from this list: send the line "unsubscribe linux-leds" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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: > > > > > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > > > > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: > > > > >> > > > > > >> > 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/mfd-hwmon-leds-watchdog-v3.18 > > > > >> > > > > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > > > >> > > > > > >> > 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 to > > > > > 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. > > > > > > > > > > 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 did > > > > > > 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 > > > > > > in both my hwmon-next and watchdog-next branches. Both are currently building, > > > and already pushed into to my repository at kernel.org. > > > > > > So, effectively, when I send my pull request to Linus, all patches from > > > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire series. > > > The same will happen when Lee sends his pull request, and Wim, and you. > > > I believe that is what Lee is asking for. > > > > That's right. It's not okay to break this branch up. If it was, we > > would have been able to apply our respective components into our own > > trees from the beginning, but as there are interdependencies, breaking > > 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. > > > > 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.
On Wed, Sep 24, 2014 at 07:41:43PM +0100, Lee Jones wrote: > On Wed, 24 Sep 2014, Guenter Roeck wrote: > > > On Wed, Sep 24, 2014 at 09:33:32AM -0700, Bryan Wu wrote: > > > On Wed, Sep 24, 2014 at 9:18 AM, Lee Jones <lee.jones@linaro.org> 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 52addcf9d6669fa439387610bc65c92fa0980cef: > > > >> > > > > >> > 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/mfd-hwmon-leds-watchdog-v3.18 > > > >> > > > > >> > for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: > > > >> > > > > >> > 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 to > > > > 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. > > > > > > > > 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 did > > > > 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 > > > > in both my hwmon-next and watchdog-next branches. Both are currently building, > > and already pushed into to my repository at kernel.org. > > > > So, effectively, when I send my pull request to Linus, all patches from > > mfd-hwmon-leds-watchdog-v3.18 will be included, ie the entire series. > > The same will happen when Lee sends his pull request, and Wim, and you. > > I believe that is what Lee is asking for. > > That's right. It's not okay to break this branch up. If it was, we > would have been able to apply our respective components into our own > trees from the beginning, but as there are interdependencies, breaking > 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. > Hi, please do not forget the MAINTAINERS Patch for this series. I have send it last week attached to this series. Thanks Regards Andy > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Guenter, Bryan, Wim, The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef: 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/mfd-hwmon-leds-watchdog-v3.18 for you to fetch changes up to 964356938fcd3c0001a786f55b9f0a0fbe47656a: 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 ---------------------------------------------------------------- Andreas Werner (4): mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog 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