On 7/19/22 12:43 PM, Song Liu wrote: > Hi Jens, > > Please consider pulling the following changes on top of your for-5.20/drivers > branch. The major changes are: > 1. Fix md disk_name lifetime problems, by Christoph Hellwig; > 2. Convert prepare_to_wait() to wait_woken() api, by Logan Gunthorpe; > 3. Fix sectors_to_do bitmap issue, by Logan Gunthorpe. This has worse conflicts, it looks like. And not particularly trivial. Do you have a merge resolution? We might want to consider doing a special branch for this... -- Jens Axboe