From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Kuehling, Felix" <Felix.Kuehling@amd.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"Yang, Philip" <Philip.Yang@amd.com>,
Dave Airlie <airlied@linux.ie>,
"Deucher, Alexander" <Alexander.Deucher@amd.com>
Subject: Re: [PATCH 1/1] drm/amdgpu: adopt to hmm_range_register API change
Date: Thu, 4 Jul 2019 07:33:50 +1000 [thread overview]
Message-ID: <20190704073350.1776b317@canb.auug.org.au> (raw)
In-Reply-To: <a9764210-9401-471b-96a7-b93606008d07@amd.com>
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi Felix,
On Wed, 3 Jul 2019 21:03:32 +0000 "Kuehling, Felix" <Felix.Kuehling@amd.com> wrote:
>
> It looks like Stephen already applied my patch as a conflict resolution
> on linux-next, though. I see linux-next/master is getting updated
> non-fast-forward. So is the idea that its history will updated again
> with the final resolution on drm-next or drm-fixes?
linux-next gets rebased every day (that is its nature). Do not worry
about that, I will cope with whatever you do.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-07-03 21:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 1:55 Kuehling, Felix
2019-07-03 4:54 ` Stephen Rothwell
2019-07-03 8:30 ` Stephen Rothwell
2019-07-03 14:10 ` Jason Gunthorpe
2019-07-03 21:03 ` Kuehling, Felix
2019-07-03 21:09 ` Alex Deucher
2019-07-03 21:32 ` Stephen Rothwell
2019-07-03 23:11 ` Dave Airlie
2019-07-04 2:00 ` Jason Gunthorpe
2019-07-04 2:01 ` Jason Gunthorpe
2019-07-07 23:30 ` Stephen Rothwell
2019-07-08 14:09 ` Jason Gunthorpe
2019-07-08 15:26 ` Kuehling, Felix
2019-07-08 15:35 ` Stephen Rothwell
2019-07-03 21:33 ` Stephen Rothwell [this message]
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=20190704073350.1776b317@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Alexander.Deucher@amd.com \
--cc=Felix.Kuehling@amd.com \
--cc=Philip.Yang@amd.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@mellanox.com \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.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