clamor has quit [Read error: Connection reset by peer]
clamor has joined #u-boot
f_|DEPRECATED has quit [Ping timeout: 272 seconds]
sally_ has joined #u-boot
sally has quit [Ping timeout: 260 seconds]
Poltawer has joined #u-boot
sszy has joined #u-boot
Poltawer has quit [Ping timeout: 260 seconds]
Poltawer has joined #u-boot
monstr has joined #u-boot
haritz has joined #u-boot
haritz has quit [Changing host]
haritz has joined #u-boot
monstr has quit [Ping timeout: 252 seconds]
sbach has joined #u-boot
wooosaiiii has quit [Remote host closed the connection]
wooosaiiii has joined #u-boot
f_|DEPRECATED has joined #u-boot
sbach has quit [Ping timeout: 260 seconds]
alexxy has quit [Ping timeout: 272 seconds]
alexxy has joined #u-boot
goliath has joined #u-boot
KREYREN has joined #u-boot
f_ is now known as funderscore
funderscore is now known as f_
sbach has joined #u-boot
KREYREN has quit [Remote host closed the connection]
KREYREN has joined #u-boot
mmu_man has joined #u-boot
ungeskriptet has joined #u-boot
sbach has quit [Ping timeout: 244 seconds]
KREYREN has quit [Ping timeout: 264 seconds]
ungeskriptet has quit [Remote host closed the connection]
ungeskriptet has joined #u-boot
ungeskriptet has quit [Remote host closed the connection]
ungeskriptet has joined #u-boot
naoki has joined #u-boot
naoki has quit [Client Quit]
Poltawer has quit [Ping timeout: 245 seconds]
Poltawer has joined #u-boot
<shadows>
Tart
<shadows>
struggling with phone terminal and irssi while traveling here
<shadows>
Tartarus: that doc helps if there's a cherry-pick needed from released dts-rebasing that is not rebased yet into U-Boot git repo, but not what I'm asking about
<Tartarus>
shadows: Oh, even further out. Then they go in arch/$(arch)/dts/ and then replaced when OF_UPSTREAM is an option
<shadows>
example is pretend we're at rc2+ in Linux release and yeah the merge window is closed so everything is going "everywhere" all the specific -next branch commits that get picked up next merge window
<shadows>
meanwhile there's an OF_UPSTREAM board in U-Boot that benefits from linux-next dt changes... those would be a commit to resolve merge conflict until next Linux merge window and rc1?
<Tartarus>
Yeah, if it's not where dts-rebasing will have it, it goes in arch/ instead for now
<Tartarus>
If it's something critical to fix, we'll I guess ahve to deal with modifying dts/upstream/ out-of-band slightly
<Tartarus>
But i'd consider that a corner case
<shadows>
okay no opinion here either way it's just a question of how do you want those commits to line up, since you might need to track overlaps when pulling in devicetree-rebasing
<shadows>
I don't know how git works to that point, if out-of-band commit from the accepted upstream for-next series/patches resolves quietly for you or is that more work
<Tartarus>
A reason I don't want to take things too soon is that I resolve conflicts in dts/upstream with a 'cp' from the kernel sources of that tag
<shadows>
ah okay, yes makes sense
sbach has joined #u-boot
<shadows>
maybe an example added to that doc with how such a specific thing could be structured? so can systematically revert U-Boot commits that are localized forms of the upstream for-next commits
<shadows>
I think this is a newer workflow that is not something we needed to describe before
<Tartarus>
More documentation is always better yes, I'm just not sure how common this case is.
<shadows>
something like a replaced-by:devicetree-rebasing-6.15rc1 tag for something that was for-next during Linux 6.14rc2+ ?
<shadows>
or better to describe what devicetree-rebasing release that for-next commit was ahead of and not attempt to predict the future ?
ungeskriptet has quit [Remote host closed the connection]
ungeskriptet has joined #u-boot
ungeskriptet has quit [Remote host closed the connection]
ungeskriptet has joined #u-boot
sbach has quit [Ping timeout: 265 seconds]
adriano has joined #u-boot
ldevulder has quit [Ping timeout: 244 seconds]
ldevulder has joined #u-boot
dsimic has quit [Ping timeout: 265 seconds]
dsimic has joined #u-boot
adriano has quit [Ping timeout: 240 seconds]
mmu_man has quit [Ping timeout: 244 seconds]
eballetbo has joined #u-boot
mmu_man has joined #u-boot
sbach has joined #u-boot
mmu_man has quit [Ping timeout: 245 seconds]
mripard has quit [Quit: WeeChat 4.6.2]
mckoan is now known as mckoan|away
eichehome_ has joined #u-boot
<Tartarus>
I don't know if tags are as important as noting it in the commit message
sbach has quit [Ping timeout: 276 seconds]
eichehome has joined #u-boot
eichehome_ has quit [Changing host]
eichehome_ has joined #u-boot
eichehome_ has quit [Quit: eichehome_]
eichehome_ has joined #u-boot
eichehome has quit [Quit: eichehome]
vagrantc has joined #u-boot
ldevulder has quit [Ping timeout: 260 seconds]
clamor has quit [Ping timeout: 252 seconds]
sbach has joined #u-boot
clamor has joined #u-boot
sally_ has quit [Changing host]
sally_ has joined #u-boot
sally_ is now known as sally
clamor has quit [Read error: Connection reset by peer]
rvalue- has joined #u-boot
sbach has quit [Ping timeout: 276 seconds]
rvalue has quit [Ping timeout: 268 seconds]
mmu_man has joined #u-boot
rvalue- is now known as rvalue
eballetbo has quit [Quit: Connection closed for inactivity]