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

[Bryan Wu]

On Wed, Sep 24, 2014 at 9:57 AM, Guenter Roeck <linux@xxxxxxxxxxxx> 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@xxxxxxxxxx> 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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/