On 9/29/23 6:12 AM, Song Liu wrote: > > >> On Sep 28, 2023, at 11:02 PM, Jens Axboe <axboe@xxxxxxxxx> wrote: >> >> On 9/28/23 2:58 PM, Song Liu wrote: >>> Hi Jens, >>> >>> Please consider pulling the following changes for md-next on top of your >>> for-6.7/block branch. >>> >>> Major changes in these patches are: >>> >>> 1. Make rdev add/remove independent from daemon thread, by Yu Kuai; >>> 2. Refactor code around quiesce() and mddev_suspend(), by Yu Kuai. >> >> Changes looks fine to me, but this patch: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/commit/?h=md-next&id=b71fe4ac7531d67e6fc8c287cbcb2b176aa93833 >> >> is referencing a commit that doesn't exist: >> >> "After commit 4d27e927344a ("md: don't quiesce in mddev_suspend()")," >> >> which I think should be: >> >> b39f35ebe86d ("md: don't quiesce in mddev_suspend()") >> >> where is this other sha from? > > The other sha was from a previous md-next that got rebased later. > I guess Kuai didn't catch it because he had the old sha in his > local git cache. I should have caught it, but missed it because > it was not behind a Fixed tag (still my fault). Makes sense. It's not a huge deal, and I would not rebase your tree for it. Mostly just curious where it came from. > I recently improved my process to only do rebase when necessary > (I used to rebase too often). Hopefully this will prevent sha > mismatch in the future. However, to fix this one, I guess I have > no options but rebase the branch? I will fix it later today and > resend the pull request. I did notice that the tree looks much better now, rather than have all brand new commits. Thanks for doing that! So I say we keep it as-is and I pull it - it's easy enough to find the real commit just based on the subject. -- Jens Axboe
