[lkml]   [2022]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: [GIT PULL] hwmon updates for v5.18
On 3/20/22 16:13, Guenter Roeck wrote:
> Hi Linus,
> Please pull hwmon updates for Linux v5.18 from signed tag:
> git:// hwmon-for-v5.18

I forgot to mention:

there will be a conflict against spi-next. from Stephen Rothwell:

> 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.


 \ /
  Last update: 2022-03-21 01:18    [W:0.102 / U:0.564 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site