Messages in this thread | | | Date | Tue, 9 Dec 2014 11:00:35 +0100 | From | Johan Hovold <> | Subject | Re: [GIT PULL] MFD for v3.19 |
| |
On Mon, Dec 08, 2014 at 08:06:11PM -0800, Linus Torvalds wrote: > On Mon, Dec 8, 2014 at 4:00 AM, Lee Jones <lee.jones@linaro.org> wrote: > > > > Johan Hovold (4): > > mfd: Use mfd_add_hotplug_devices() helper > > This clashed with the earlier fix "mfd: viperboard: Fix > platform-device id collision" also by Johan. > > My merge resolution ends up taking the mfd_add_hotplug_devices() version. > > See drivers/mfd/viperboard.c, and somebody should double-check and > test that this actually works. The "Fix platform-device id collision" > commit supposedly fixed a problem with multiple boards, I'm > hoping/assuming that the mfd_add_hotplug_devices() helper handles that > case correctly.
The end result is correct since, as you assumed, mfd_add_hotplug_devices() handles that case.
Just discussed this with Lee. The original patch adding the helper was on top of the fix, but the latter never made it into mfd-next.
Not sure what happened to the git history after your merge, though, since commit
b6684228726c ("mfd: viperboard: Fix platform-device id collision")
no longer shows up when doing
git log origin/master -- drivers/mfd/viperboard.c
and the diff of
1ab589c72ef6 ("mfd: Use mfd_add_hotplug_devices() helper")
looks like the first patch has never been applied, even though it is listed when doing "git log origin/master".
Johan
| |