On 6/10/21 7:21 PM, Daejun Park wrote: > Changelog: 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". $ patch -p1 < ~/20210610-\[PATCH\ v37\ 1_4\]\ scsi_\ ufs_\ Introduce\ HPB\ feature-10889.eml patching file Documentation/ABI/testing/sysfs-driver-ufs patching file drivers/scsi/ufs/Kconfig patching file drivers/scsi/ufs/Makefile patching file drivers/scsi/ufs/ufs-sysfs.c patching file drivers/scsi/ufs/ufs.h patching file drivers/scsi/ufs/ufshcd.c Hunk #1 succeeded at 24 with fuzz 2. Hunk #2 succeeded at 4985 (offset 20 lines). Hunk #3 succeeded at 5013 (offset 20 lines). Hunk #4 succeeded at 5041 (offset 20 lines). Hunk #5 succeeded at 7123 with fuzz 2 (offset 15 lines). Hunk #6 succeeded at 7523 (offset 12 lines). Hunk #7 succeeded at 7551 (offset 12 lines). Hunk #8 succeeded at 7792 (offset 12 lines). Hunk #9 succeeded at 7938 (offset 12 lines). Hunk #10 succeeded at 8087 (offset 12 lines). Hunk #11 succeeded at 8135 (offset 12 lines). Hunk #12 succeeded at 8839 (offset 12 lines). Hunk #13 succeeded at 8964 (offset 12 lines). Hunk #14 succeeded at 9042 (offset 12 lines). patching file drivers/scsi/ufs/ufshcd.h Hunk #1 succeeded at 641 (offset -2 lines). Hunk #2 succeeded at 870 (offset -2 lines). patching file drivers/scsi/ufs/ufshpb.c patching file drivers/scsi/ufs/ufshpb.h Thanks, Bart.
