On Mon, Jan 13, 2025 at 10:44:41AM +1000, Dave Airlie wrote:
Pretty sure we've explained how a few times now, not sure we can do much more.
If you see a commit with a cherry-pick link in it and don't have any
sight on that commit in Linus's tree, ignore the cherry-pick link in
it, assume it's a future placeholder for that commit id. You could if
you wanted to store that info somewhere, but there shouldn't be a
need.
When the initial commit enters during the next merge window, you look
for that subject or commit id in the stable tree already, if it
exists, dump the latest Linus patch on the floor, it's already in
stable your job is done.
We can't rely too heavily on the subject line. Consider the following two
very different commits that have the same subject line:
3119668c0e0a ("drm/amd/display: avoid disable otg when dig was disabled")
218784049f4b ("drm/amd/display: avoid disable otg when dig was disabled")
Now, if a new commit lands and it has the following "Fixes:" tag:
Fixes: abcdef12345 ("drm/amd/display: avoid disable otg when dig was disabled")
Does it refer to one of the older commits? Or a new commit that will
show up during the merge window?
Or... What happens if a new commit with the very same subject line shows
up, and it has a cherry-pick link that points to a completely different
commit that is not in the tree yet? :)
But just in general, there are so many odd combinations of commits where
trying to follow the suggestion you've made will just break...
Something like these two identical commits which are not tagged for stable:
21afc872fbc2 ("drm/amd/display: Add monitor patch for specific eDP")
3d71a8726e05 ("drm/amd/display: Add monitor patch for specific eDP")
And the following two identical ones which are tagged for stable:
b7cdccc6a849 ("drm/amd/display: Add monitor patch for specific eDP")
04a59c547575 ("drm/amd/display: Add monitor patch for specific eDP")
--
Thanks,
Sasha
