[PATCH 2/5] dma-buf: remove kmap_atomic interface

[Christian König]

Am 20.06.2018 um 16:04 schrieb Christian König:
> Am 20.06.2018 um 14:52 schrieb Daniel Vetter:
>> On Wed, Jun 20, 2018 at 2:46 PM, Christian König
>> <ckoenig.leichtzumerken at gmail.com> wrote:
>>> [SNIP]
>>>> Go ahead, that's the point of commit rights. dim might complain if you
>>>> cherry picked them and didn't pick them up using dim apply though ...
>>>
>>> I've fixed up the Link tags, but when I try "dim push-branch 
>>> drm-misc-next"
>>> I only get the error message "error: dst ref refs/heads/drm-misc-next
>>> receives from more than one src."
>>>
>>> Any idea what is going wrong here?
>> Sounds like multiple upstreams for your local drm-misc-next branch,
>> and git then can't decide which one to pick. If you delete the branch
>> and create it using dim checkout drm-misc-next this shouldn't happen.
>> We're trying to fit into existing check-outs and branches, but if you
>> set things up slightly different than dim would have you're off script
>> and there's limited support for that.
>>
>> Alternative check out your .git/config and remove the other upstreams.
>> Or attach your git config if this isn't the issue (I'm just doing some
>> guessing here).
>
> I've tried to delete my drm-misc-next branch and recreate it, but that 
> doesn't seem to help.
>
> Attached is my .git/config, but at least on first glance it looks ok 
> as well.
>
> Any ideas?

Ok that seems to be a bug in dim.

"bash -x dim push drm-misc-next" looks like it tries to push the branch 
drm-misc-next twice to the drm-misc remote: git push drm-misc 
drm-misc-next drm-misc-next

When I try that manually I get the same result, but "git push drm-misc 
drm-misc-next" just seemed to work fine.

Let's hope that I haven't messed things up totally on the server now.

Christian.

>
> Thanks,
> Christian.
>
>> -Daniel
>>
>>
>