From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] random number generator updates for 6.10-rc1
Date: Fri, 17 May 2024 17:11:10 +0200 [thread overview]
Message-ID: <Zkdzjh3XwS17WwiI@zx2c4.com> (raw)
In-Reply-To: <20240517150315.2213425-1-Jason@zx2c4.com>
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
next prev parent reply other threads:[~2024-05-17 15:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-17 15:03 Jason A. Donenfeld
2024-05-17 15:11 ` Jason A. Donenfeld [this message]
2024-05-18 18:07 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zkdzjh3XwS17WwiI@zx2c4.com \
--to=jason@zx2c4.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®