On Mon, 2020-08-31 at 09:20 +0800, Can Guo wrote: > On 2020-08-31 02:11, Bean Huo wrote: > > Hi Can > > This patch conflicts and be not in line with this series patches : > > h > > ttps://patchwork.kernel.org/cover/11709279/, which has been applied > > into 5.9/scsi-fixes. But they are not apppiled in the 5.9/scsi- > > queue. > > > > Maybe you should rebase your patch from scsi-fixes branch. or do > > you > > have another better option? > > > > Thanks, > > Bean > > > > I am pushing this change due to LINERSET handling needs it and > LINERESET > handling is added based on my previous changes to err_handler, which > are > picked by 5.10/scsi-queue. So the two are applied for 5.10/scsi- > queue > only. > Any conflicts you see on 5.10/scsi-queue? Hi Can I meant scsi-fixes branch. no conflict with scsi-queue branch. If the the changes in the scsi-fixes branch will never be merged to scsi- queue branch.It is fine. Thanks, Bean > > Thanks, > > Can Guo.
