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

[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?

Thanks,
Christian.

> -Daniel
>
>

-------------- next part --------------
[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
[remote "origin"]
	url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[remote "drm-tip"]
	url = ssh://git.freedesktop.org/git/drm-tip
	fetch = +refs/heads/*:refs/remotes/drm-tip/*
[branch "maintainer-tools"]
	remote = drm-tip
	merge = refs/heads/maintainer-tools
[branch "rerere-cache"]
	remote = drm-tip
	merge = refs/heads/rerere-cache
[branch "drm-tip"]
	remote = drm-tip
	merge = refs/heads/drm-tip
[remote "airlied"]
	url = git://people.freedesktop.org/~airlied/linux
	fetch = +refs/heads/*:refs/remotes/airlied/*
[remote "sound"]
	url = git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
	fetch = +refs/heads/*:refs/remotes/sound/*
[remote "drm-intel"]
	url = ssh://git.freedesktop.org/git/drm/drm-intel
	fetch = +refs/heads/*:refs/remotes/drm-intel/*
[remote "drm-amd"]
	url = ssh://git.freedesktop.org/git/drm/drm-amd
	fetch = +refs/heads/*:refs/remotes/drm-amd/*
[remote "drm"]
	url = ssh://git.freedesktop.org/git/drm/drm
	fetch = +refs/heads/*:refs/remotes/drm/*
[remote "drm-misc"]
	url = ssh://git.freedesktop.org/git/drm/drm-misc
	fetch = +refs/heads/*:refs/remotes/drm-misc/*
[remote "baker"]
	url = ssh://baker.local/usr/src/linux
	fetch = +refs/heads/*:refs/remotes/baker/*
[branch "drm-misc-next"]
	remote = drm-misc
	merge = refs/heads/drm-misc-next