Re: [PATCH v6 0/4] Introduce MEN 14F021P00 BMC driver series

From: Bryan Wu <cooloney@gmail.com>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Lee Jones <lee.jones@linaro.org>,
	Andreas Werner <andreas.werner@men.de>,
	lkml <linux-kernel@vger.kernel.org>,
	Samuel Ortiz <sameo@linux.intel.com>,
	lm-sensors@lm-sensors.org, wim@iguana.be,
	linux-watchdog@vger.kernel.org,
	"rpurdie@rpsys.net" <rpurdie@rpsys.net>,
	Linux LED Subsystem <linux-leds@vger.kernel.org>
Subject: Re: [PATCH v6 0/4] Introduce MEN 14F021P00 BMC driver series
Date: Wed, 24 Sep 2014 11:07:15 -0700	[thread overview]
Message-ID: <CAK5ve-Jm0xv3eL5y8WHsfchnpDyJYw9BiyW49mrMyN-y+g0maA@mail.gmail.com> (raw)
In-Reply-To: <20140924165739.GA31578@roeck-us.net>

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