lkml.org 
[lkml]   [2024]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] random number generator updates for 6.10-rc1
I forgot to mention, there's a small conflict with the pm tree, which
you've already pulled, where `.owner = THIS_MODULE` is removed from the
driver, as part of a tree-wide set of changes. The changes in my tree
convert the driver to a platform driver, rather than an acpi driver,
which also doesn't have the `.owner = THIS_MODULE` line, because those
got converted years ago. So the right conflict resolution is to just
take my commits and skip 00e8b52bf9. That's the same resolution in -next
too. It should be trivial enough.

Jason

\
 
 \ /
  Last update: 2024-05-27 18:30    [W:0.046 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site