FS#79196 - [linux] upstream mix up 3bbd9b0bb7ebcf385d24fdf9f541b6b390f07624

Attached to Project: Arch Linux
Opened by Thomas Lübking (luebking) - Tuesday, 25 July 2023, 07:55 GMT
Last edited by Jan Alexander Steffens (heftig) - Wednesday, 26 July 2023, 12:21 GMT
Task Type Bug Report
Category Packages: Core
Status Closed
Assigned To Jan Alexander Steffens (heftig)
Levente Polyak (anthraxx)
Architecture All
Severity Low
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Votes 0
Private No

Details

https://bbs.archlinux.org/viewtopic.php?pid=2111558#p2111558

Got added to protect eDPs, reverted because it ended up risking eDPs and now is back in w/ the original commit.
This task depends upon

Closed by  Jan Alexander Steffens (heftig)
Wednesday, 26 July 2023, 12:21 GMT
Reason for closing:  Upstream
Comment by Thomas Lübking (luebking) - Tuesday, 25 July 2023, 07:59 GMT Comment by loqs (loqs) - Tuesday, 25 July 2023, 11:56 GMT
Have you contacted upstream stable to let them know they reintroduced a commit they had just reverted and has reverted again in mainline possibly by replying to [1]?
Edit:
Series of events for 6.4:
6.4 contains the initial commit e749dd10e5f292061ad63d2b030194bf7d7d452c [2]
6.4.4 reverts that commit in 4538616b518d8fd259c8316e47c5909e9713b331 [3]
6.4.5 reverts that commit in 3bbd9b0bb7ebcf385d24fdf9f541b6b390f07624 [4]
Edit2:
Queued for 6.4.7 [6] and 6.1.42 [7]

Mainline reverts the commit again in d6149086b45e150c170beaa4546495fd1880724c [5] but incorrectly states it is a revert of e749dd10e5f292061ad63d2b030194bf7d7d452c (the upstream initial commit) when it should be 7a0e005c7957931689a327b2a4e7333a19f13f95 (the reintroduction of the initial commit/revert of the revert)

[1] https://lore.kernel.org/stable/20230721160537.476563256%40linuxfoundation.org/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e749dd10e5f292061ad63d2b030194bf7d7d452c
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4538616b518d8fd259c8316e47c5909e9713b331
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3bbd9b0bb7ebcf385d24fdf9f541b6b390f07624
[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d6149086b45e150c170beaa4546495fd1880724c
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=e6df090a412868dfb3cb5255e553f54167b61c97
[7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=844bdc4975f6f60fb89b11da86d9ddfc56320218
Comment by Thomas Lübking (luebking) - Tuesday, 25 July 2023, 14:10 GMT
> Have you contacted upstream stable to let them know they reintroduced a commit they had just reverted and has reverted again in mainline possibly by replying to [1]?
No.
Is there still upstream action requried w/ the 6.4.7 queue?

> Mainline reverts the commit again in d6149086b45e150c170beaa4546495fd1880724c [5] but incorrectly states it is a revert of e749dd10e5f292061ad63d2b030194bf7d7d452c (the upstream initial commit) when it should be 7a0e005c7957931689a327b2a4e7333a19f13f95 (the reintroduction of the initial commit/revert of the revert)
When you've some lazy time: https://www.youtube.com/watch?v=kuj5x3afeK8 :D
Comment by loqs (loqs) - Tuesday, 25 July 2023, 15:05 GMT
>Is there still upstream action required w/ the 6.4.7 queue?
No the fix will arrive with the next upstream kernel releases.
Comment by Toolybird (Toolybird) - Tuesday, 25 July 2023, 21:43 GMT
@luebking thanks for reporting, @loqs thanks for investigating.

Seeing as this will be fixed at next bump, probably not worth worrying about...but let's see if PM's want action.

Loading...