All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: kbuild test robot <fengguang.wu@intel.com>,
	Dave Airlie <airlied@redhat.com>
Cc: intel-gfx@lists.freedesktop.org, kbuild-all@01.org
Subject: Re: [drm-intel:drm-intel-nightly 2/7] drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of 'amdgpu_ttm_tt_affect_userptr'
Date: Fri, 19 Feb 2016 17:04:23 +0200	[thread overview]
Message-ID: <87ziuwvj0o.fsf@intel.com> (raw)
In-Reply-To: <201602192257.HIYr81PM%fengguang.wu@intel.com>


Okay, so I screwed up the conflict resolution in our integration
tree. Nothing to worry about here, as long as whoever does the
merge/backmerge with the real trees doesn't do the same mistake.

BR,
Jani.


On Fri, 19 Feb 2016, kbuild test robot <fengguang.wu@intel.com> wrote:
> tree:   git://anongit.freedesktop.org/drm-intel drm-intel-nightly
> head:   e7d04bf9d65001191a0b64e322bffa713280d132
> commit: a77c4b431c465402d508e1c53a55ab9a11c2471f [2/7] Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-nightly
> config: i386-allmodconfig (attached as .config)
> reproduce:
>         git checkout a77c4b431c465402d508e1c53a55ab9a11c2471f
>         # save the attached .config to linux build tree
>         make ARCH=i386 
>
> All errors (new ones prefixed by >>):
>
>>> 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,
>          ^
>
> vim +/amdgpu_ttm_tt_affect_userptr +818 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>
> d7006964 Christian König 2016-02-08  812  	if (gtt->userptr > end || gtt->userptr + size <= start)
> d7006964 Christian König 2016-02-08  813  		return false;
> d7006964 Christian König 2016-02-08  814  
> d7006964 Christian König 2016-02-08  815  	return true;
> d38ceaf9 Alex Deucher    2015-04-20  816  }
> d38ceaf9 Alex Deucher    2015-04-20  817  
> cc1de6e8 Christian König 2016-02-08 @818  bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,
> cc1de6e8 Christian König 2016-02-08  819  				  unsigned long end)
> cc1de6e8 Christian König 2016-02-08  820  {
> cc1de6e8 Christian König 2016-02-08  821  	struct amdgpu_ttm_tt *gtt = (void *)ttm;
>
> :::::: The code at line 818 was first introduced by commit
> :::::: cc1de6e800c253172334f8774c419dc64401cd2e drm/amdgpu: fix issue with overlapping userptrs
>
> :::::: TO: Christian König <christian.koenig@amd.com>
> :::::: CC: Alex Deucher <alexander.deucher@amd.com>
>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

      reply	other threads:[~2016-02-19 15:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-19 14:55 [drm-intel:drm-intel-nightly 2/7] drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of 'amdgpu_ttm_tt_affect_userptr' kbuild test robot
2016-02-19 15:04 ` 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=87ziuwvj0o.fsf@intel.com \
    --to=jani.nikula@intel.com \
    --cc=airlied@redhat.com \
    --cc=fengguang.wu@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kbuild-all@01.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 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.