marcan changed the topic of #asahi to: Asahi Linux: porting Linux to Apple Silicon macs | General project discussion | GitHub: https://alx.sh/g | Wiki: https://alx.sh/w | Topics: #asahi-dev #asahi-re #asahi-gpu #asahi-offtopic | Keep things on topic | Logs: https://alx.sh/l/asahi
nico_32 has quit [Ping timeout: 248 seconds]
nico_32 has joined #asahi
rjeffman has quit [Ping timeout: 260 seconds]
nico_32 has quit [Ping timeout: 240 seconds]
nico_32 has joined #asahi
nico_32 has quit [Ping timeout: 240 seconds]
macc24 has quit [Ping timeout: 258 seconds]
nico_32 has joined #asahi
nickiminjaj has joined #asahi
omoiti has quit [Ping timeout: 240 seconds]
nickiminjaj has quit [Quit: leaving]
omoiti has joined #asahi
phiologe has quit [Ping timeout: 258 seconds]
phiologe has joined #asahi
sven has quit [Remote host closed the connection]
sven has joined #asahi
marcan has quit [Ping timeout: 260 seconds]
marcan has joined #asahi
odmir has quit [Remote host closed the connection]
<marcan>
oh wait, that base was supposed to be one you already had? I used the point *after* the merges because otherwise the diffstat would have a million things from tty/arm64
<arnd>
marcan: I think I see the problem: you sent the merge commit as the base, but I don't have that merge in my tree locally
<arnd>
I think I can fix that up later on, just need to do another local merge to create a sensible git history
<marcan>
the overall base is v5.12-rc3 prior to the merges
choozy has joined #asahi
<arnd>
if you had passed -rc3 as the base for git request-pull, it would have worked, but then I would see all the commits of the tty tree as well
<marcan>
so using that as a base should work
<marcan>
right
<marcan>
both sounded vaguely wrong to me :-)
<arnd>
anyway, I'll make it work later when I get back
<marcan>
for future reference, would using v5.12-rc3 have been preferable?
<marcan>
anyway, I'll get dinner too :) (shows you how offset I am...)
<delroth>
just call it breakfast at this point
<jn__>
dinner around now is almost central european time :)
Necrosporus has quit [Read error: Connection reset by peer]
Necrosporus has joined #asahi
rwhitby has quit [Ping timeout: 248 seconds]
the-mentor3 has joined #asahi
VinDuv has joined #asahi
odmir has joined #asahi
frode_0xa has quit [Quit: leaving]
frode_0xa has joined #asahi
frode_0xa has quit [Client Quit]
roxfan2 is now known as roxfan
<arnd>
there is really no ideal way when you have pulled in other dependencies, especially more than one. The infrastructure is trying to prevent submitters from sneaking in additional patches by faking a merge base, and we clearly want this, but it also gets in the way in this case
frode_0xa has joined #asahi
frode_0xa has quit [Client Quit]
<marcan>
right
<marcan>
in this case you can probably just repeat my merges (for the conflict, delete the entire conflict section, it was a removal) and verify that the result is the same, or something like that
bpye has quit [Ping timeout: 268 seconds]
bpye has joined #asahi
Necrosporus is now known as Guest87771
Guest87771 has quit [Killed (barjavel.freenode.net (Nickname regained by services))]