[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=whQ48-RsU85vM+Kwi=pRNU9fX8JXmooqx4=c1QYOjv2uw@mail.gmail.com>
Date: Thu, 15 Dec 2022 13:20:11 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Alex Williamson <alex.williamson@...hat.com>
Cc: linux-kernel@...r.kernel.org,
"kvm@...r.kernel.org" <kvm@...r.kernel.org>
Subject: Re: [GIT PULL] VFIO updates for v6.2-rc1
On Thu, Dec 15, 2022 at 12:24 PM Alex Williamson
<alex.williamson@...hat.com> wrote:
>
> I've provided resolution of the conflict chunks here below
> the diffstat.
Ok, mine is slightly different, but the differences seem to be either
irrelevant ordering differences (in the Makefile), and due to Jason
apparently renaming the goto targets which I didn't do.
But hey,. maybe I messed up, so please do check out it and test. I
verified that it all builds cleanly for me, but that's all the testing
it has gotten.
Linus
Powered by blists - more mailing lists