<tango_>
why would pushing result in a failed merge?
bcheng has joined #dri-devel
<sravn>
tango_: It may be bc I did not do a "dim update-branches" before I pushed, so I had an inconsistent state locally.
gouchi has joined #dri-devel
toolchains has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
srslypascal is now known as Guest5196
srslypascal has joined #dri-devel
<sravn>
I looked at the nice documentation, but that did not really help me here. So I have left it broken as I am afraid to do more damage in any attempt to fix it
Guest5196 has quit [Ping timeout: 480 seconds]
Haaninjo has joined #dri-devel
kathleen___ has joined #dri-devel
toolchains has joined #dri-devel
kts has quit [Ping timeout: 480 seconds]
kts has joined #dri-devel
srslypascal is now known as Guest5199
srslypascal has joined #dri-devel
Guest5199 has quit [Ping timeout: 481 seconds]
srslypascal has quit [Ping timeout: 480 seconds]
toolchains has quit [Ping timeout: 480 seconds]
toolchains has joined #dri-devel
kts has quit [Quit: Konversation terminated!]
kts has joined #dri-devel
YuGiOhJCJ has joined #dri-devel
srslypascal has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
norris has joined #dri-devel
camus has quit [Ping timeout: 480 seconds]
sul has quit [Ping timeout: 480 seconds]
sul has joined #dri-devel
reduz_ has joined #dri-devel
kts has quit [Ping timeout: 480 seconds]
tchar_ has joined #dri-devel
kts has joined #dri-devel
egbert has joined #dri-devel
srslypascal has quit [Remote host closed the connection]
srslypascal has joined #dri-devel
ogabbay has joined #dri-devel
YuGiOhJCJ has quit [Quit: YuGiOhJCJ]
xyene has joined #dri-devel
pcercuei has joined #dri-devel
Duke`` has quit [Ping timeout: 480 seconds]
MajorBiscuit has joined #dri-devel
toolchains has joined #dri-devel
dcz has quit [Ping timeout: 480 seconds]
Prf_Jakob has joined #dri-devel
icecream95 has quit [Ping timeout: 480 seconds]
toolchains has quit [Ping timeout: 480 seconds]
MajorBiscuit has quit [Ping timeout: 480 seconds]
tfiga has joined #dri-devel
rib has joined #dri-devel
Company has joined #dri-devel
nehsou^ has joined #dri-devel
MajorBiscuit has joined #dri-devel
Duke`` has joined #dri-devel
Major_Biscuit has joined #dri-devel
sul has quit [Ping timeout: 480 seconds]
Duke`` has quit [Ping timeout: 480 seconds]
Duke`` has joined #dri-devel
mclasen has quit []
toolchains has joined #dri-devel
<mlankhorst>
sravn: let me see if I can get drm-tip checked out here. :)
toolchains has quit [Read error: Connection timed out]
Major_Biscuit has quit [Ping timeout: 480 seconds]
toolchains has joined #dri-devel
egbert has quit [Ping timeout: 480 seconds]
narmstrong_ has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
radii has joined #dri-devel
JTL has joined #dri-devel
egbert has joined #dri-devel
MajorBiscuit has quit [Ping timeout: 480 seconds]
toolchains has joined #dri-devel
tlwoerner has joined #dri-devel
kts has quit [Ping timeout: 480 seconds]
rohiiyer0 has joined #dri-devel
hfink has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
kts has joined #dri-devel
Lucretia has quit []
bluebugs has joined #dri-devel
Lucretia has joined #dri-devel
toolchains has joined #dri-devel
sul has joined #dri-devel
jstultz has joined #dri-devel
zehortigoza has quit [Remote host closed the connection]
epoll has quit [Ping timeout: 480 seconds]
toolchains has quit [Ping timeout: 480 seconds]
dcz has joined #dri-devel
epoll has joined #dri-devel
nehsou^ has quit [Remote host closed the connection]
ZeZu has joined #dri-devel
kem has joined #dri-devel
JohnnyonFlame has joined #dri-devel
kts has quit [Ping timeout: 480 seconds]
agd5f has quit [Server closed connection]
agd5f has joined #dri-devel
abhinav__ has quit [Server closed connection]
abhinav__ has joined #dri-devel
srslypascal has quit [Ping timeout: 480 seconds]
srslypascal has joined #dri-devel
abws has joined #dri-devel
gouchi has quit [Remote host closed the connection]
toolchains has joined #dri-devel
seanpaul__ has quit [Server closed connection]
seanpaul__ has joined #dri-devel
zzag has quit [Server closed connection]
zzag has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
pixelclu- has quit []
pixelcluster has joined #dri-devel
MajorBiscuit has joined #dri-devel
dschuermann has quit [Server closed connection]
dschuermann has joined #dri-devel
sdutt has joined #dri-devel
dkh^ has joined #dri-devel
MajorBiscuit has quit [Quit: WeeChat 3.5]
toolchains has joined #dri-devel
iive has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
toolchains has joined #dri-devel
toolchains has quit [Ping timeout: 480 seconds]
gouchi has joined #dri-devel
kennylevinsen has quit [Server closed connection]
kennylevinsen has joined #dri-devel
toolchains has joined #dri-devel
<sravn>
mlankhorst: Let me know if I can do anything, and in the end I hope to know what I did wrong
<mlankhorst>
sravn: it's mostly archeology, figuring out what changed..
* vbt
thinks what went wrong
pcercuei has quit [Read error: Connection reset by peer]
pcercuei has joined #dri-devel
<mlankhorst>
looks like what changed in drm-misc-next is: drm/amdgpu: Fix for drm buddy memory corruption
toolchains has joined #dri-devel
<mlankhorst>
which conflicts with ' Revert "drm/amdgpu: add drm buddy support to amdgpu"
eukara has quit [Remote host closed the connection]
eukara has joined #dri-devel
dkh^ has joined #dri-devel
<mlankhorst>
so probably best to ask ckoenig what we want..
MajorBiscuit has joined #dri-devel
<mlankhorst>
one is in drm-misc-fixes, other in drm-misc-next-fixes
<mlankhorst>
My guess is one can be reverted
<mlankhorst>
easiest seems to be to revert the commit in drm-misc-fixes
<mlankhorst>
I think the amd people are sleeping though. :)
<mlankhorst>
And I will too, good night!
toolchains has quit [Ping timeout: 480 seconds]
toolchains has joined #dri-devel
rkanwal has quit [Ping timeout: 480 seconds]
<sravn>
mlankhorst: thanks for taking a look. Night time here too!
toolchains has quit [Ping timeout: 480 seconds]
<mlankhorst>
I tried to make the revert a fixup patch, but dim tooling didn't like it
toolchains has joined #dri-devel
<mlankhorst>
one more attempt, maybe if I use git apply
<mlankhorst>
Merging drm-misc/drm-misc-fixes... Applying manual fixup patch for drm-tip merge... error: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h: finns inte i indexet