lkml.org 
[lkml]   [2018]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the driver-core tree with the pm tree
    Hi all,

    Today's linux-next merge of the driver-core tree got a conflict in:

    drivers/base/platform.c
    u
    between commit:

    2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call")

    from the pm tree and commit:

    99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()")

    from the driver-core tree.

    I fixed it up (see below) and can carry the fix as necessary. This
    is now fixed as far as linux-next is concerned, but any non trivial
    conflicts should be mentioned to your upstream maintainer when your tree
    is submitted for merging. You may also want to consider cooperating
    with the maintainer of the conflicting tree to minimise any particularly
    complex conflicts.

    --
    Cheers,
    Stephen Rothwell

    diff --cc drivers/base/platform.c
    index 0fb5f140f1b0,e1ba610482c0..000000000000
    --- a/drivers/base/platform.c
    +++ b/drivers/base/platform.c
    @@@ -447,7 -447,8 +447,7 @@@ void platform_device_del(struct platfor
    {
    int i;

    - if (pdev) {
    + if (!IS_ERR_OR_NULL(pdev)) {
    - device_remove_properties(&pdev->dev);
    device_del(&pdev->dev);

    if (pdev->id_auto) {
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2018-12-10 06:16    [W:6.819 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site