Emantor has joined #asahi-gpu
elros has quit [Ping timeout: 480 seconds]
possiblemeatball has quit [Quit: Quit]
cylm_ has joined #asahi-gpu
marvin24 has joined #asahi-gpu
marvin24_ has quit [Ping timeout: 480 seconds]
<
i509vcb>
I'm not sure if I am doing a really naive rebase
<
i509vcb>
I thought it would be something like this:
<
i509vcb>
1. Find the point at which asahi/main and agxv/main forked
<
i509vcb>
2. rebase --onto asahi/main
<
i509vcb>
I feel I am doing something wrong if the vast majority of the conflicts are occuring in the gallium driver
<
i509vcb>
which agxv really isn't supposed to be touching
cylm_ has quit [Quit: WeeChat 4.0.4]
crabbedhaloablut has joined #asahi-gpu
marvin24_ has joined #asahi-gpu
marvin24 has quit [Ping timeout: 480 seconds]
loki_val has joined #asahi-gpu
crabbedhaloablut has quit [Read error: Connection reset by peer]
mairacanal has quit [Remote host closed the connection]
<
jannau>
i509vcb: that probably tries to rebase commits from the previous asahi/main onto the current one
<
jannau>
if easy to determine `rebase --onto asahi/main asahi/$prev_main` should work better. asahi/$prev_main could be a tag or commit id
cr1901 has quit [Read error: Connection reset by peer]
hightower2 has quit [Ping timeout: 480 seconds]
hightower2 has joined #asahi-gpu
hightower3 has joined #asahi-gpu
hightower2 has quit [Ping timeout: 480 seconds]
eldriitch has joined #asahi-gpu
hightower2 has joined #asahi-gpu
hightower3 has quit [Ping timeout: 480 seconds]
Misthios has joined #asahi-gpu
hightower2 has quit [Ping timeout: 480 seconds]
compassion1785 has quit [Quit: lounge quit]
compassion1785 has joined #asahi-gpu
compassion1785 has quit []
compassion1785 has joined #asahi-gpu
<
alyssa>
i509vcb: lmk if you still need help with the rebase next week and hopefully I'll be well enough to take care of it then :-)
maria has quit [Ping timeout: 480 seconds]
maria has joined #asahi-gpu
alyssa has quit [Quit: alyssa]
flom84 has joined #asahi-gpu
aleasto- is now known as aleasto
jeisom has quit [Ping timeout: 480 seconds]
Misthios has quit [Remote host closed the connection]
Misthios has joined #asahi-gpu
Misthios has quit [Remote host closed the connection]
Misthios has joined #asahi-gpu
flom84 has quit [Ping timeout: 480 seconds]
c10l has quit [Quit: Bye o/]
c10l has joined #asahi-gpu
c10l has joined #asahi-gpu
cr1901 has joined #asahi-gpu
hightower2 has joined #asahi-gpu
rhysmdnz has quit [Quit: Bridge terminating on SIGTERM]
Guest250 has quit [Quit: Bridge terminating on SIGTERM]
rhysmdnz has joined #asahi-gpu
Guest328 has joined #asahi-gpu
eldriitch has quit [Quit: Page closed]
eldriitch has joined #asahi-gpu
eldriitch2 has joined #asahi-gpu
eldriitch2 has quit [Ping timeout: 480 seconds]
chadmed has quit [Read error: Connection reset by peer]
chadmed has joined #asahi-gpu
chadmed has quit [Ping timeout: 480 seconds]
eldriitch has quit [Remote host closed the connection]
eldriitch has joined #asahi-gpu
elros has joined #asahi-gpu
compassion1785 has quit [Quit: lounge quit]
elros has quit [Ping timeout: 480 seconds]
compassion1785 has joined #asahi-gpu
loki_val has quit []
elros has joined #asahi-gpu
compassion1785 has quit [Quit: lounge quit]
jeisom has joined #asahi-gpu
elros has quit [Ping timeout: 480 seconds]
elros has joined #asahi-gpu
compassion1785 has joined #asahi-gpu
elros has quit [Ping timeout: 480 seconds]
elros has joined #asahi-gpu
chadmed has joined #asahi-gpu
eldriitch has quit [Quit: Leaving...]
eldriitch2 has joined #asahi-gpu
eldriitch2 has quit [Ping timeout: 480 seconds]
elros has quit [Quit: WeeChat 4.0.4]
elros has joined #asahi-gpu
elros has quit [Ping timeout: 480 seconds]
darkapex3 has quit [Remote host closed the connection]
darkapex3 has joined #asahi-gpu
elros has joined #asahi-gpu
elros has quit [Ping timeout: 480 seconds]