From: Jani Nikula <jani.nikula@intel.com>
To: Rodrigo Vivi <rodrigo.vivi@gmail.com>,
intel-gfx <intel-gfx@lists.freedesktop.org>,
DRI mailing list <dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
christian.koenig@amd.com, Dave Airlie <airlied@redhat.com>
Subject: Re: duplicated patch on drm-intel-nightly
Date: Mon, 22 Feb 2016 11:34:10 +0200 [thread overview]
Message-ID: <87povpum0d.fsf@intel.com> (raw)
In-Reply-To: <CABVU7+v3Fpqh5tH3gvjpTmSBPsaK9eMRirDO=JbnHgpLjeOhJQ@mail.gmail.com>
On Sat, 20 Feb 2016, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> We have a duplicated patch on drm-intel-nightly
>
> commits d7006964d and cc1de6e80
[I snipped the extra trailing 'q' off the 2nd commit id.]
> causing:
>
> drivers/gpu/drm//amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of
> ‘amdgpu_ttm_tt_affect_userptr’
> bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
> ^
> drivers/gpu/drm//amd/amdgpu/amdgpu_ttm.c:799:6: note: previous
> definition of ‘amdgpu_ttm_tt_affect_userptr’ was here
> bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
>
> One cc'ed stable and other didn't. So I'm not sure how this
> duplication happened or in which tree, so I'm pinging you all that
> know better how to identify and solve this issue.
There's nothing unusual here. The patch was apparently first applied to
drm-next, and then cherry-picked to drm-fixes and this one is now in
Linus' master. We do this all the time in i915.
The build fail is, or rather was, in our integration tree. I thought I
had screwed up the conflict resolution [1], but turns out the fail was
in a silent conflict. The function got added twice. It's now fixed in
our tree.
Heads up Dave, I presume this will happen when drm-next gets merged to
Linus' tree in the next merge window. (Or perhaps in linux-next
already.)
BR,
Jani.
[1] http://mid.gmane.org/87ziuwvj0o.fsf@intel.com
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2016-02-22 9:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 22:36 duplicated patch on drm-intel-nightly Rodrigo Vivi
2016-02-22 9:34 ` Jani Nikula [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=87povpum0d.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@redhat.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.