lkml.org 
[lkml]   [2022]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the spi tree with the hwmon-staging tree
    Hello,

    On Thu, Feb 10, 2022 at 01:25:06PM +1100, Stephen Rothwell wrote:
    > Today's linux-next merge of the spi tree got a conflict in:
    >
    > drivers/hwmon/adt7310.c
    >
    > between commits:
    >
    > 9c950b125f78 ("hwmon: (adt7x10) Remove empty driver removal callback")
    >
    > from the hwmon-staging tree and commit:
    >
    > a0386bba7093 ("spi: make remove callback a void function")
    >
    > from the spi tree.
    >
    > I fixed it up (I just used the former version) 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.

    Just for the record: I agree this is the right resolution (i.e. take the
    file from the hwmon tree).

    Best regards
    Uwe

    --
    Pengutronix e.K. | Uwe Kleine-König |
    Industrial Linux Solutions | https://www.pengutronix.de/ |
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2022-02-10 21:38    [W:4.452 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site