lkml.org 
[lkml]   [2014]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL] MFD for v3.19
From
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.

Linus


\
 
 \ /
  Last update: 2014-12-09 05:21    [W:0.085 / U:0.400 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site