Re: [GIT PULL] VFIO updates for v6.2-rc1

From: Alex Williamson
Date: Thu Dec 15 2022 - 16:56:29 EST


On Thu, 15 Dec 2022 13:20:11 -0800
Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

> On Thu, Dec 15, 2022 at 12:24 PM Alex Williamson
> <alex.williamson@xxxxxxxxxx> 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.

Yep, all looks well. Thanks!

Alex