lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the driver-core tree with the powerpc tree
    On Fri, Mar 09, 2012 at 04:40:25PM +1100, Stephen Rothwell wrote:
    > Hi Greg,
    >
    > Today's linux-next merge of the driver-core tree got a conflict in
    > drivers/base/driver.c between commit fcd6f7620202 ("driver-core: remove
    > legacy iSeries hack") from the powerpc tree and commit 9875bb480cc8
    > ("Eliminate get_driver() and put_driver()") from the driver-core tree.
    >
    > Just context changes. I fixed it up (see below) and can carry the fix as
    > necessary.

    Looks good to me, thanks for doing this.

    greg k-h


    \
     
     \ /
      Last update: 2012-03-09 16:21    [W:0.022 / U:3.000 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site