> Does this patch series perhaps need to be rebased? This is what git am > reports against Martin's 5.14/scsi-staging branch: > > $ git am ~/20210610-\[PATCH\ v37\ * > Applying: scsi: ufs: Introduce HPB feature > error: patch failed: drivers/scsi/ufs/ufshcd.c:24 > error: drivers/scsi/ufs/ufshcd.c: patch does not apply > Patch failed at 0001 scsi: ufs: Introduce HPB feature > hint: Use 'git am --show-current-patch=diff' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". git am -3 seems to work. Thanks, Avri
