> On Jul 19, 2022, at 11:45 AM, Jens Axboe <axboe@xxxxxxxxx> wrote: > > 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? Hmm... it was a clean merge on top of Linus' tree, but got conflicts with linux-next. I guess the conflict is from other changes in the block tree? > > We might want to consider doing a special branch for this... Yeah, I can port each patch on top of the special branch. To make sure they all work. Thanks, Song
