Received-SPF: pass (google.com: domain of linux-kernel+bounces-182271-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 17 May 2024 17:11:10 +0200
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
Message-ID: <Zkdzjh3XwS17WwiI@zx2c4.com>
References: <20240517150315.2213425-1-Jason@zx2c4.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
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