lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 20 Mar 2022 17:17:27 -0700 From: Guenter Roeck <linux@...ck-us.net> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: linux-hwmon@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: [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://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.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. Guenter
Powered by blists - more mailing lists