On 5/23/23 19:35, Niklas Cassel wrote: > On Tue, May 23, 2023 at 07:08:27PM +0900, Damien Le Moal wrote: >> On 5/23/23 18:56, Niklas Cassel wrote: >>> On Mon, May 22, 2023 at 05:41:19PM -0400, Martin K. Petersen wrote: >>>> >>>> Niklas, >>>> >>>>> This series adds support for Command Duration Limits. >>>> >>>> Applied to 6.5/scsi-staging, thanks! >>> >>> Thank you Martin! >>> >>> >>> Damien, Martin, >>> considering that the libata changes depend on the scsi changes, >>> and considering that further libata EH cleanups are planned for >>> 6.5 now when the IPR driver is gone, I think that the best move >>> is to follow the advice of: >>> https://docs.kernel.org/maintainer/rebasing-and-merging.html#merging-from-sibling-or-upstream-trees >> >> Hannes cleanup of EH will create a conflict with the scsi tree but can go in >> through the ata tree independently so I was not planning on doing a rebase, >> especially not on the scsi tree. I will notify Stephen about the conflict send >> him a resolution to apply and carry for linux-next. When the 6.5 merge window >> open, I will wait for the James to send the scsi PR and send my PR to Linus >> after that with the conflict resolution, as usual. > > I wasn't suggesting that you do a rebase on the scsi tree, I was > suggesting for a topic branch to be merged through both trees. > > But I was just thinking how to make it as easy as possible to > handle additional libata patches that should go on top of the > CDL series (without creating conflicts for Stephen and Linus). > >> >> So far, I do not see any big issue with that. > > If you think that the conflicts will be trivial, feel free to > ignore my suggestion :) So far, the conflicts do not look bad at all. So we should be fine. Will adapt if needed. > > > Kind regards, > Niklas -- Damien Le Moal Western Digital Research
