From: Alex Williamson <alex.williamson@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>
Subject: Re: [GIT PULL] VFIO updates for v6.2-rc1
Date: Thu, 15 Dec 2022 14:55:33 -0700 [thread overview]
Message-ID: <20221215145533.3a27b429.alex.williamson@redhat.com> (raw)
In-Reply-To: <CAHk-=whQ48-RsU85vM+Kwi=pRNU9fX8JXmooqx4=c1QYOjv2uw@mail.gmail.com>
On Thu, 15 Dec 2022 13:20:11 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Thu, Dec 15, 2022 at 12:24 PM Alex Williamson
> <alex.williamson@redhat.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.
Yep, all looks well. Thanks!
Alex
next prev parent reply other threads:[~2022-12-15 21:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 20:24 [GIT PULL] VFIO updates for v6.2-rc1 Alex Williamson
2022-12-15 21:20 ` Linus Torvalds
2022-12-15 21:55 ` Alex Williamson [this message]
2022-12-15 21:20 ` 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=20221215145533.3a27b429.alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=kvm@vger.kernel.org \
--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